From adaa0dac1218c1e478ebff24c8ce3c6b97c532f2 Mon Sep 17 00:00:00 2001 From: Artem3213212 Date: Sun, 28 Oct 2018 15:36:44 +0200 Subject: [PATCH] Fix file names --- ...calTokeniser.pas => AG.PascalTokenizer.pas | 174 +++++++++--------- DelphiTests/MainTest.pas | 2 +- DelphiTests/Tests.dpr | 2 +- README.md | 2 +- 4 files changed, 90 insertions(+), 90 deletions(-) rename AG.PascalTokeniser.pas => AG.PascalTokenizer.pas (69%) diff --git a/AG.PascalTokeniser.pas b/AG.PascalTokenizer.pas similarity index 69% rename from AG.PascalTokeniser.pas rename to AG.PascalTokenizer.pas index 6d72758..9a69952 100644 --- a/AG.PascalTokeniser.pas +++ b/AG.PascalTokenizer.pas @@ -1,4 +1,4 @@ -unit AG.PascalTokeniser; +unit AG.PascalTokenizer; interface @@ -116,12 +116,12 @@ begin x := 1+Fix; while s[y]='' do begin - if y + 1 = s.Count then - begin - ended := True; - break; - end; - inc(y); + if y + 1 = s.Count then + begin + ended := True; + break; + end; + inc(y); end; end; Exit(True); @@ -191,106 +191,106 @@ begin begin if now_sym = '/' then begin - if next_sym = '/' then - begin - for i:=x to l+Fix do - ss:=ss+line[i]; - x := l+Fix; - break; - end; + if next_sym = '/' then + begin + for i:=x to l+Fix do + ss:=ss+line[i]; + x := l+Fix; + break; + end; end else if now_sym = '{' then begin - ml := '}'; - ss := now_sym; - last_i0 := y; + ml := '}'; + ss := now_sym; + last_i0 := y; end else if now_sym = '(' then begin - if next_sym = '*' then - begin - ml := ')'; - inc(x); - last_i0 := y; - ss := now_sym + next_sym; - end - else - begin - ss := '('; - inc(x); - break; - end; + if next_sym = '*' then + begin + ml := ')'; + inc(x); + last_i0 := y; + ss := now_sym + next_sym; + end + else + begin + ss := '('; + inc(x); + break; + end; end else begin - if SYMS1.Contains(now_sym) then - begin - ss := now_sym; - inc(x); - if SYMS2.Contains(now_sym + next_sym) then - begin - inc(x); - ss := ss + next_sym; - end; - break; - end - else if now_sym = #39 then - begin - ss := #39; - inc(x); - if next_sym <> '' then - begin - ss := ss + next_sym; - while line[x] <> #39 do - begin - inc(x); - if not _is_readable() then - begin - dec(x); - break; - end; - ss := ss + line[x]; - end; - inc(x); - end; - break; - end - else - begin - while not NO_NAME_SYMS.Contains(line[x]) do - begin - ss := ss + line[x]; - inc(x); - if not _is_readable() then - break; - end; - break; - end; + if SYMS1.Contains(now_sym) then + begin + ss := now_sym; + inc(x); + if SYMS2.Contains(now_sym + next_sym) then + begin + inc(x); + ss := ss + next_sym; + end; + break; + end + else if now_sym = #39 then + begin + ss := #39; + inc(x); + if next_sym <> '' then + begin + ss := ss + next_sym; + while line[x] <> #39 do + begin + inc(x); + if not _is_readable() then + begin + dec(x); + break; + end; + ss := ss + line[x]; + end; + inc(x); + end; + break; + end + else + begin + while not NO_NAME_SYMS.Contains(line[x]) do + begin + ss := ss + line[x]; + inc(x); + if not _is_readable() then + break; + end; + break; + end; end; end else begin while last_i0 <> y do begin - ss := ss + #10; - inc(last_i0); + ss := ss + #10; + inc(last_i0); end; if ss[length(ss) + fix] = #10 then begin - ss[length(ss) + fix] := now_sym; - ss := ss + #10; + ss[length(ss) + fix] := now_sym; + ss := ss + #10; end; if now_sym = ml then - if ml = '}' then - begin - inc(x); - break; - end - else if (x <> 0) and (line[x - 1] = '*') then - begin - inc(x); - break; - end; + if ml = '}' then + begin + inc(x); + break; + end + else if (x <> 0) and (line[x - 1] = '*') then + begin + inc(x); + break; + end; end; _next_readable(); end; diff --git a/DelphiTests/MainTest.pas b/DelphiTests/MainTest.pas index 2ac7ffa..0789597 100644 --- a/DelphiTests/MainTest.pas +++ b/DelphiTests/MainTest.pas @@ -5,7 +5,7 @@ uses DUnitX.TestFramework, System.Classes, WinAPI.Windows, - AG.PascalTokeniser; + AG.PascalTokenizer; type [TestFixture] diff --git a/DelphiTests/Tests.dpr b/DelphiTests/Tests.dpr index a5da060..831e8f5 100644 --- a/DelphiTests/Tests.dpr +++ b/DelphiTests/Tests.dpr @@ -12,7 +12,7 @@ uses DUnitX.Loggers.Xml.NUnit, DUnitX.TestFramework, MainTest in 'MainTest.pas', - AG.PascalTokeniser in '..\AG.PascalTokeniser.pas'; + AG.PascalTokenizer in '..\AG.PascalTokenizer.pas'; var runner : ITestRunner; diff --git a/README.md b/README.md index 8aed042..e1a2629 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AGPascalTokeniser +# PascalTokeniser Tokenizer for Pascal syntax (Delphi/FreePascal) written for Delphi or FreePascal