Changeset 203 for branches/interpreter2/UParser.pas

Timestamp:

Apr 17, 2020, 10:16:25 PM (5 years ago)

Author:

chronos

Message:

• Added: Simple pascal code generator.

File:

• branches/interpreter2/UParser.pas (modified) (6 diffs)

branches/interpreter2/UParser.pas

@@ -27 +27 @@
     function ParseExpressionOperation(Block: TBlock; out ExpressionOperation: TExpressionOperation): Boolean;
     function ParseExpressionOperand(Block: TBlock; out ExpressionOperand: TExpressionOperand): Boolean;
+    function ParseConstantRef(Block: TBlock; out ConstantRef: TConstant): Boolean;
     function ParseConstant(Block: TBlock; out ConstantRef: TConstant): Boolean;
     function ParseVariable(Block: TBlock; out VariableRef: TVariable): Boolean;
@@ -342 +343 @@
           else Error('Expression operands needs to be same type.');
       end else Error('Missing operand.');
-    end;
+    end else Operand.Free;
   end;
   if not Result then Tokenizer.Pos := LastPos;
@@ -364 +365 @@
     Result := True;
     ExpressionOperand := TExpressionOperand.Create;
+    ExpressionOperand.ConstantDirect := Constant;
+    ExpressionOperand.OperandType := otConstantDirect;
+  end else
+  if ParseConstantRef(Block, Constant) then begin
+    Result := True;
+    ExpressionOperand := TExpressionOperand.Create;
     ExpressionOperand.ConstantRef := Constant;
-    ExpressionOperand.OperandType := otConstant;
+    ExpressionOperand.OperandType := otConstantRef;
   end else
   if ParseVariable(Block, Variable) then begin
@@ -371 +378 @@
     ExpressionOperand := TExpressionOperand.Create;
     ExpressionOperand.VariableRef := Variable;
-    ExpressionOperand.OperandType := otVariable;
+    ExpressionOperand.OperandType := otVariableRef;
   end else Error('Expected expression operand.');
 end;
 
-function TParser.ParseConstant(Block: TBlock; out ConstantRef: TConstant
+function TParser.ParseConstantRef(Block: TBlock; out ConstantRef: TConstant
   ): Boolean;
 var
@@ -389 +396 @@
       Result := True;
     end;
-  end else
+  end;
+  if not Result then Tokenizer.Pos := LastPos;
+end;
+
+function TParser.ParseConstant(Block: TBlock; out ConstantRef: TConstant
+  ): Boolean;
+var
+  LastPos: TTokenizerPos;
+  Token: TToken;
+begin
+  Result := False;
+  LastPos := Tokenizer.Pos;
+  Token := Tokenizer.GetNext;
   if Token.Kind = tkNumber then begin
     Result := True;
-    ConstantRef := Block.Constants.AddNew('_C' + IntToStr(Block.Constants.Count));
+    ConstantRef := TConstant.Create;
     ConstantRef.TypeRef := Block.GetType('Integer');
     ConstantRef.Value := TValueInteger.Create;
@@ -399 +418 @@
   if Token.Kind = tkString then begin
     Result := True;
-    ConstantRef := Block.Constants.AddNew('_C' + IntToStr(Block.Constants.Count));
+    ConstantRef := TConstant.Create;
     ConstantRef.TypeRef := Block.GetType('string');
     ConstantRef.Value := TValueString.Create;