Changeset 5 for trunk/Compiler

Timestamp:

Nov 5, 2010, 9:36:20 AM (14 years ago)

Author:

george

Message:

• Fixed: Variable and constant expression.

Location:

trunk/Compiler

Files:

• Analyze/UPascalParser.pas (modified) (6 diffs)
• Produce/UProducerDynamicC.pas (modified) (1 diff)
• Produce/UProducerPascal.pas (modified) (1 diff)
• USourceCode.pas (modified) (2 diffs)

trunk/Compiler/Analyze/UPascalParser.pas

@@ -137 +137 @@
 function TPascalParser.ParseExpression(SourceCode: TExpression): Boolean;
 var
-  NewVariable: TVariable;
-  NewExpression: TExpression;
-  NewMethod: TFunction;
-  Constant: TConstant;
-  UseType: TType;
-  //  Brackets: Integer;
   Expressions: TListExpression;
-  I: integer;
-  II: integer;
+  I: Integer;
+  II: Integer;
 begin
   try
     Expressions := TListExpression.Create;
+    Expressions.OwnsObjects := False;
     Expressions.Add(TExpression.Create);
     with SourceCode do begin
@@ -155 +150 @@
         if not ParseExpressionParenthases(SourceCode, Expressions) then
         if not ParseExpressionOperator(SourceCode, Expressions) then
-        if not ParseExpressionRightValue(SourceCode, Expressions) then begin
+        if not ParseExpressionRightValue(SourceCode, Expressions) then
+        begin
           ErrorMessage(SInvalidAssignmentValue, [NextToken]);
           ReadToken;
@@ -171 +167 @@
             Expressions[I - 1].SubItems.Last := Expressions[I];
             Expressions[I + 1].SubItems.First := Expressions[I];
-            //Expressions.Delete(I);
+            Expressions.Delete(I);
           end else Inc(I);
         end;
@@ -196 +192 @@
     // Subexpression
     NewExpression := TExpression.Create;
+    NewExpression.Braces := True;
     NewExpression.CommonBlock := SourceCode.CommonBlock;
     ParseExpression(NewExpression);
@@ -230 +227 @@
   NewExpression: TExpression;
   Identifier: string;
-  O: TObject;
-begin
-  O := nil;
-  with SourceCode do
-  if IsIdentificator(NextToken) then begin
+  IntConst: Integer;
+begin
+  NewExpression := nil;
+  with SourceCode do begin
+//  if IsIdentificator(NextToken) then begin
     // Start with type
     UseType := CommonBlock.Types.Search(NextToken);
@@ -240 +237 @@
       ReadToken;
       if (UseType is TTypeRecord) or (UseType is TTypeClass) then begin
+        // type.variable or type.function
         Expect('.');
         Identifier := ReadToken;
         UseVariable := TTypeRecord(UseType).CommonBlock.Variables.Search(Identifier);
         if Assigned(UseVariable) then begin
-          O := UseVariable;
-        end;
-        if not Assigned(O) then begin
+          NewExpression := TExpression.Create;
+          NewExpression.CommonBlock := SourceCode.CommonBlock;
+          NewExpression.NodeType := ntVariable;
+          NewExpression.Variable := UseVariable;
+        end;
+        if not Assigned(NewExpression) then begin
           UseFunction := TTypeRecord(UseType).CommonBlock.Functions.Search(Identifier);
           if Assigned(UseFunction) then begin
-            O := UseFunction;
+            NewExpression := TExpression.Create;
+            NewExpression.CommonBlock := SourceCode.CommonBlock;
+            NewExpression.NodeType := ntFunction;
+            NewExpression.FunctionCall := UseFunction;
           end;
         end;
-        if not Assigned(O) then
+        if not Assigned(NewExpression) then
           ErrorMessage(SUndefinedVariable, [Identifier]);
       end else ErrorMessage(SIllegalExpression, [Identifier]);
     end;
-    if not Assigned(O) then begin
-      UseVariable := CommonBlock.Variables.Search(Identifier);
+    if not Assigned(NewExpression) then begin
+      // Referenced variable
+      UseVariable := CommonBlock.Variables.Search(NextToken);
       if Assigned(UseVariable) then begin
-        // Referenced variable
         ReadToken;
         NewExpression := TExpression.Create;
         NewExpression.CommonBlock := SourceCode.CommonBlock;
         NewExpression.NodeType := ntVariable;
-        NewExpression.Variable := TVariable(UseVariable);
-        SubItems.Last := NewExpression;
-      end;
-    end;
-    if not Assigned(O) then begin
-      ParseExpressionFunctionCall(SourceCode, Expressions, TFunction(O));
-      NewExpression := TExpression.Create;
-      NewExpression.CommonBlock := SourceCode.CommonBlock;
-      NewExpression.NodeType := ntFunction;
-      NewExpression.FunctionCall := TFunction(O);
-      SubItems.Last := NewExpression;
-    end;
-    if not Assigned(O) then begin
+        NewExpression.Variable := UseVariable;
+      end;
+    end;
+    if not Assigned(NewExpression) then begin
+      // Function call
+      ParseExpressionFunctionCall(SourceCode, Expressions, UseFunction);
+      if Assigned(UseFunction) then begin
+        NewExpression := TExpression.Create;
+        NewExpression.CommonBlock := SourceCode.CommonBlock;
+        NewExpression.NodeType := ntFunction;
+        NewExpression.FunctionCall := UseFunction;
+      end;
+    end;
+    if not Assigned(NewExpression) then begin
+      // Referenced constant
       UseConstant := CommonBlock.Constants.Search(NextToken);
       if Assigned(UseConstant) then begin
         ReadToken;
-        O := UseConstant;
         NewExpression := TExpression.Create;
         NewExpression.CommonBlock := SourceCode.CommonBlock;
         NewExpression.NodeType := ntConstant;
-        NewExpression.Constant := TConstant(O);
-        SubItems.Last := NewExpression;
-      end;
-    end;
-    if not Assigned(O) then begin
+        NewExpression.Constant := UseConstant;
+      end;
+    end;
+    if not Assigned(NewExpression) then begin
       // Constant value
-      O := TConstant.Create;
-      TConstant(O).Value := ReadToken;
       NewExpression := TExpression.Create;
       NewExpression.CommonBlock := SourceCode.CommonBlock;
-      NewExpression.NodeType := ntConstant;
-      NewExpression.Constant := TConstant(O);
-      SubItems.Last := NewExpression;
-    end;
-    if not Assigned(O) then begin
+      NewExpression.NodeType := ntValue;
+      NewExpression.Constant := TConstant.Create;
+      NewExpression.Value := ReadToken;
+      if TryStrToInt(NewExpression.Value, IntConst) then
+        NewExpression.Value := IntConst;
+    end;
+    if Assigned(NewExpression) then begin
+      Expressions.Last.SubItems.Last := NewExpression;
+      with Expressions.Items[Expressions.Add(TExpression.Create)] do
+      begin
+        CommonBlock := SourceCode.CommonBlock;
+        SubItems.First := NewExpression;
+      end;
+      Result := True;
+    end else begin
+      Result := False;
       ErrorMessage(SUnknownIdentifier, [ReadToken]);
     end;
-
-    with Expressions.Items[Expressions.Add(TExpression.Create)] do
-    begin
-      CommonBlock := SourceCode.CommonBlock;
-      SubItems.First := NewExpression;
-    end;
-    Result := True;
-  end else Result := False;
+//  end else Result := False;
+  end;
 end;
 

trunk/Compiler/Produce/UProducerDynamicC.pas

@@ -274 +274 @@
 function TProducerDynamicC.GenerateExpression(Expression: TExpression): string;
 begin
-  case Expression.NodeType of
-    ntConstant: begin
-      if VarType(Expression.Value) = varString then
-        Result := '"' + Expression.Value + '"'
-        else Result := Expression.Value;
-    end;
-    ntVariable: Result := Expression.Variable.Name;
-    ntFunction: Result := Expression.FunctionCall.Name;
-    ntOperator: begin
-      Result := GenerateExpression(TExpression(Expression.SubItems.First))
-        + ' ' + TranslateOperator(Expression.OperatorName) + ' ' +
-        GenerateExpression(TExpression(Expression.SubItems.Last));
-    end;
-    ntNone: ;
+  if Assigned(Expression) then begin
+    case Expression.NodeType of
+      ntConstant: begin
+        Result := Expression.Constant.Name;
+      end;
+      ntValue: begin
+       if VarType(Expression.Value) = varString then
+          Result := '"' + Expression.Value + '"'
+          else Result := Expression.Value;
+      end;
+      ntVariable: Result := Expression.Variable.Name;
+      ntFunction: Result := Expression.FunctionCall.Name;
+      ntOperator: begin
+        Result := GenerateExpression(TExpression(Expression.SubItems.First))
+          + ' ' + TranslateOperator(Expression.OperatorName) + ' ' +
+          GenerateExpression(TExpression(Expression.SubItems.Last));
+      end;
+      ntNone: ;
+    end;
+    if Expression.Braces then Result := '(' + Result + ')';
   end;
 end;

trunk/Compiler/Produce/UProducerPascal.pas

@@ -309 +309 @@
 function TProducerPascal.GenerateExpression(Expression: TExpression): string;
 begin
-  case Expression.NodeType of
-    ntConstant: Result := Expression.Value;
-    ntVariable: Result := Expression.Variable.Name;
-    ntFunction: Result := Expression.FunctionCall.Name;
-    ntOperator: begin
-      Result := GenerateExpression(TExpression(Expression.SubItems.First))
-        + ' ' + Expression.OperatorName + ' ' +
-        GenerateExpression(TExpression(Expression.SubItems.Last));
-    end;
-    ntNone: ;
+  if Assigned(Expression) then begin
+    case Expression.NodeType of
+      ntConstant: begin
+        Result := Expression.Constant.Name;
+      end;
+      ntValue: begin
+       if VarType(Expression.Value) = varString then
+          Result := '''' + Expression.Value + ''''
+          else Result := Expression.Value;
+      end;
+      ntVariable: Result := Expression.Variable.Name;
+      ntFunction: Result := Expression.FunctionCall.Name;
+      ntOperator: begin
+        Result := GenerateExpression(TExpression(Expression.SubItems.First))
+          + ' ' + Expression.OperatorName + ' ' +
+          GenerateExpression(TExpression(Expression.SubItems.Last));
+      end;
+      ntNone: ;
+    end;
+    if Expression.Braces then Result := '(' + Result + ')';
   end;
 end;

trunk/Compiler/USourceCode.pas

@@ -14 +14 @@
   TModuleType = (mdProgram, mdUnit, mdLibrary, mdPackage);
 
-  TNodeType = (ntNone, ntVariable, ntFunction, ntConstant, ntOperator);
+  TNodeType = (ntNone, ntVariable, ntFunction, ntConstant, ntOperator,
+    ntValue);
 
   TTypeVisibility = (tvPublic, tvPublished, tvPrivate, tvProtected);
@@ -333 +334 @@
     SubItems: TListExpression;
     Associated: Boolean;
+    Braces: Boolean;
     constructor Create;
     destructor Destroy; override;