Changeset 5 for trunk/Compiler/Produce

Timestamp:

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

Author:

george

Message:

• Fixed: Variable and constant expression.

Location:

trunk/Compiler/Produce

Files:

• UProducerDynamicC.pas (modified) (1 diff)
• UProducerPascal.pas (modified) (1 diff)

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;