Changeset 149 for branches/easy compiler/UCompiler.pas

Timestamp:

Jan 18, 2018, 1:30:58 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Now arrays of string and integer are supported and executed correctly by executor.
• Added: IfNotEqual command.

File:

• branches/easy compiler/UCompiler.pas (modified) (5 diffs)

branches/easy compiler/UCompiler.pas

@@ -50 +50 @@
       ): Boolean;
     function ParseFunctionCall(SourceCode: TSourceCode; out FunctionCall: TCommandFunctionCall): Boolean;
-    function ParseIfEqual(SourceCode: TSourceCode; out IfZero: TCommandIfEqual): Boolean;
+    function ParseIfEqual(SourceCode: TSourceCode; out IfEqual: TCommandIfEqual): Boolean;
+    function ParseIfNotEqual(SourceCode: TSourceCode; out IfNotEqual: TCommandIfNotEqual): Boolean;
     function ParseReference(SourceCode: TSourceCode): TSourceReference;
     function ParseReferenceVariable(SourceCode: TSourceCode): TSourceReference;
@@ -327 +328 @@
 end;
 
-function TCompiler.ParseIfEqual(SourceCode: TSourceCode; out IfZero: TCommandIfEqual): Boolean;
+function TCompiler.ParseIfEqual(SourceCode: TSourceCode; out IfEqual: TCommandIfEqual): Boolean;
 var
   Token: TSourceToken;
@@ -338 +339 @@
   Keyword := LowerCase(Token.Text);
   if Keyword = 'ifequal' then begin
-    IfZero := TCommandIfEqual.Create;
-    IfZero.Reference1 := ParseReference(SourceCode);
-    IfZero.Reference2 := ParseReference(SourceCode);
+    IfEqual := TCommandIfEqual.Create;
+    IfEqual.Reference1 := ParseReference(SourceCode);
+    IfEqual.Reference2 := ParseReference(SourceCode);
+    Result := True;
+  end;
+  if not Result then Tokenizer.TokenIndex := TokenIndex;
+end;
+
+function TCompiler.ParseIfNotEqual(SourceCode: TSourceCode; out
+  IfNotEqual: TCommandIfNotEqual): Boolean;
+var
+  Token: TSourceToken;
+  TokenIndex: Integer;
+  Keyword: string;
+begin
+  Result := False;
+  TokenIndex := Tokenizer.TokenIndex;
+  Token := Tokenizer.GetNext;
+  Keyword := LowerCase(Token.Text);
+  if Keyword = 'ifnotequal' then begin
+    IfNotEqual := TCommandIfNotEqual.Create;
+    IfNotEqual.Reference1 := ParseReference(SourceCode);
+    IfNotEqual.Reference2 := ParseReference(SourceCode);
     Result := True;
   end;
@@ -390 +411 @@
 var
   CommandBeginEnd: TCommandBeginEnd;
-  CommandIfZero: TCommandIfEqual;
+  CommandIfEqual: TCommandIfEqual;
   CommandFunctionCall: TCommandFunctionCall;
   CommandBreak: TCommandBreak;
   CommandRepeat: TCommandRepeat;
+  CommandIfNotEqual: TCommandIfNotEqual;
 begin
   Command := nil;
@@ -401 +423 @@
     Command := CommandBeginEnd;
   end else
-  if ParseIfEqual(SourceCode, CommandIfZero) then begin
-    Command := CommandIfZero;
+  if ParseIfEqual(SourceCode, CommandIfEqual) then begin
+    Command := CommandIfEqual;
+  end else
+  if ParseIfNotEqual(SourceCode, CommandIfNotEqual) then begin
+    Command := CommandIfNotEqual;
   end else
   if ParseBreak(SourceCode, CommandBreak) then begin