Refactoring

This commit is contained in:
2018-10-29 14:46:33 +02:00
parent dfd4a5e4bd
commit 886cbb2974
5 changed files with 108 additions and 107 deletions

View File

@@ -9,11 +9,7 @@
<Title Value="fpcunitproject1"/>
<ResourceType Value="res"/>
<UseXPManifest Value="True"/>
<Icon Value="0"/>
</General>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>
@@ -36,7 +32,7 @@
<PackageName Value="FCL"/>
</Item3>
</RequiredPackages>
<Units Count="2">
<Units Count="3">
<Unit0>
<Filename Value="fpcunitproject1.lpr"/>
<IsPartOfProject Value="True"/>
@@ -46,6 +42,10 @@
<IsPartOfProject Value="True"/>
<UnitName Value="TestCase1"/>
</Unit1>
<Unit2>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<IsPartOfProject Value="True"/>
</Unit2>
</Units>
</ProjectOptions>
<CompilerOptions>

View File

@@ -16,9 +16,10 @@
<Filename Value="testcase1.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="TestCase1"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="7"/>
<CursorPos X="68" Y="18"/>
<TopLine Value="13"/>
<CursorPos X="23" Y="31"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
</Unit1>
@@ -32,11 +33,11 @@
</Unit2>
<Unit3>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<IsVisibleTab Value="True"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="2"/>
<TopLine Value="278"/>
<CursorPos X="9" Y="295"/>
<UsageCount Value="10"/>
<TopLine Value="299"/>
<CursorPos X="20" Y="313"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
@@ -51,123 +52,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="211" TopLine="191"/>
<Caret Line="189" TopLine="171"/>
</Position1>
<Position2>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="212" TopLine="191"/>
<Caret Line="190" TopLine="171"/>
</Position2>
<Position3>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="312" TopLine="295"/>
<Caret Line="191" TopLine="171"/>
</Position3>
<Position4>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="189" TopLine="171"/>
<Caret Line="192" TopLine="171"/>
</Position4>
<Position5>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="190" TopLine="171"/>
<Caret Line="193" TopLine="171"/>
</Position5>
<Position6>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="191" TopLine="171"/>
<Caret Line="196" TopLine="171"/>
</Position6>
<Position7>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="192" TopLine="171"/>
<Caret Line="295" TopLine="278"/>
</Position7>
<Position8>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="193" TopLine="171"/>
<Caret Line="300" TopLine="278"/>
</Position8>
<Position9>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="196" TopLine="171"/>
<Caret Line="312" TopLine="284"/>
</Position9>
<Position10>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="295" TopLine="278"/>
<Caret Line="189" TopLine="171"/>
</Position10>
<Position11>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="300" TopLine="278"/>
<Caret Line="190" TopLine="171"/>
</Position11>
<Position12>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="312" TopLine="284"/>
<Caret Line="191" TopLine="171"/>
</Position12>
<Position13>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="189" TopLine="171"/>
<Caret Line="192" TopLine="171"/>
</Position13>
<Position14>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="190" TopLine="171"/>
<Caret Line="193" TopLine="171"/>
</Position14>
<Position15>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="191" TopLine="171"/>
<Caret Line="196" TopLine="171"/>
</Position15>
<Position16>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="192" TopLine="171"/>
<Caret Line="295" TopLine="278"/>
</Position16>
<Position17>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="193" TopLine="171"/>
<Caret Line="300" TopLine="278"/>
</Position17>
<Position18>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="196" TopLine="171"/>
<Caret Line="312" TopLine="284"/>
</Position18>
<Position19>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="295" TopLine="278"/>
<Caret Line="189" TopLine="171"/>
</Position19>
<Position20>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="300" TopLine="278"/>
<Caret Line="190" TopLine="171"/>
</Position20>
<Position21>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="312" TopLine="284"/>
<Caret Line="191" TopLine="171"/>
</Position21>
<Position22>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="189" TopLine="171"/>
<Caret Line="192" TopLine="171"/>
</Position22>
<Position23>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="190" TopLine="171"/>
<Caret Line="193" TopLine="171"/>
</Position23>
<Position24>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="191" TopLine="171"/>
<Caret Line="196" TopLine="171"/>
</Position24>
<Position25>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="192" TopLine="171"/>
<Caret Line="295" Column="7" TopLine="278"/>
</Position25>
<Position26>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="193" TopLine="171"/>
<Filename Value="testcase1.pas"/>
<Caret Line="28" Column="11" TopLine="4"/>
</Position26>
<Position27>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="196" TopLine="171"/>
<Filename Value="testcase1.pas"/>
<Caret Line="29" Column="15" TopLine="4"/>
</Position27>
<Position28>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="295" Column="7" TopLine="278"/>
<Caret Line="295" Column="9"/>
</Position28>
<Position29>
<Filename Value="testcase1.pas"/>
<Caret Line="28" Column="11" TopLine="4"/>
<Filename Value="..\AG.PascalTokenizer.pas"/>
<Caret Line="313" Column="20" TopLine="299"/>
</Position29>
<Position30>
<Filename Value="testcase1.pas"/>
<Caret Line="29" Column="15" TopLine="4"/>
<Caret Line="23" Column="12" TopLine="8"/>
</Position30>
</JumpHistory>
</ProjectSession>

View File

@@ -19,16 +19,16 @@ implementation
procedure TTestCase1.TestHookUp;
var
input:TStrings;
tokenizer:TPasTokenizer;
token:TToken;
tokenizer:TAGPasTokenizer;
token:TAGToken;
begin
input:= TStringList.Create();
input.LoadFromFile('testcase1.pas');
tokenizer:=TPasTokenizer.Create(input);
tokenizer:=TAGPasTokenizer.Create(input);
token.ended:=False;
while not token.ended do
begin
token:=tokenizer.get_next;
token:=tokenizer.GetNext;
TestRunner.MemoLog.Append(token.Text);
end;
end;