Changeset 21 for trunk/Compiler

Timestamp:

Nov 9, 2010, 2:08:55 PM (14 years ago)

Author:

george

Message:

• Modified: Project saving.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzerPascal.pas (modified) (8 diffs)
• Produce/UProducerPascal.pas (modified) (5 diffs)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -79 +79 @@
   SInvalidAssignmentValue = 'Invalid assignment "%s".';
   SParamDiffers = 'Declaration of parametr "%s" differs.';
+  SNotRecordOrClass = '"%s" not record or class';
 
 implementation
@@ -257 +258 @@
             if Assigned(UseFunction) then begin
               // Record or class functions
-              ParseExpressionFunctionCall(SourceCode, Expressions, FunctionCall);
-              NewExpression := TExpression.Create;
-              NewExpression.CommonBlock := SourceCode.CommonBlock;
-              NewExpression.NodeType := ntFunction;
-              NewExpression.FunctionCall := FunctionCall;
+              if ParseExpressionFunctionCall(SourceCode, Expressions, FunctionCall) then begin
+                NewExpression := TExpression.Create;
+                NewExpression.CommonBlock := SourceCode.CommonBlock;
+                NewExpression.NodeType := ntFunction;
+                NewExpression.FunctionCall := FunctionCall;
+              end;
             end;
           end;
@@ -336 +338 @@
 var
   UseFunction: TFunction;
+  UseType: TType;
   NewExpression: TExpression;
   I: Integer;
@@ -544 +547 @@
       if Section = cbsConstant then begin
         ParseConstant(Constants);
-      end else begin
+      end else
+      if NextToken = 'initialization' then Break
+      else if NextToken = 'finalization' then Break
+      else begin
         ErrorMessage(SInvalidConstruction, [NextToken]);
         ReadToken;
@@ -676 +682 @@
       UseFunction.Name := UseName;
       UseFunction.FunctionType := FunctionType;
+      UseFunction.Exported := Exported;
       Add(UseFunction);
+      UseFunction.Parent.Order.Add(UseFunction);
       ValidParams := False;
     end;
@@ -690 +698 @@
         NewValueType := Parent.Types.Search(TypeName);
         if not Assigned(NewValueType) then
-          ErrorMessage(SUndefinedType, [TypeName], -1);
-(*        else
+          ErrorMessage(SUndefinedType, [TypeName], -1)
+        else
           begin
             ResultType := NewValueType;
-            with TVariable(Parent.Variables.Items[Parent.Variables.Add(
+            with TVariable(Variables.Items[Variables.Add(
                 TVariable.Create)]) do
             begin
@@ -700 +708 @@
               ValueType := NewValueType;
             end;
-          end;  *)
+          end;
       end;
       Expect(';');
@@ -1254 +1262 @@
         TTypeArray(NewType).IndexType := TypeList.Parent.Types.Search(UseName);
         if not Assigned(TTypeArray(NewType).IndexType) then
-          ErrorMessage(SUndefinedType, [UseName], -1) else
-          TTypeArray(NewType).IndexType := UseType;
+          ErrorMessage(SUndefinedType, [UseName], -1);
       end else
       if NextTokenType = ttConstantNumber then begin

trunk/Compiler/Produce/UProducerPascal.pas

@@ -454 +454 @@
   Section: TCommonBlockSection;
 begin
+  Inc(Indetation);
   with CommonBlock do begin
     for I := 0 to Order.Count - 1 do begin
@@ -459 +460 @@
         if Section <> cbsType then begin
           EmitLn;
+          Dec(Indetation);
           EmitLn('type');
+          Inc(Indetation);
         end;
         Emit(TType(Order[I]).Name + ' = ');
@@ -469 +472 @@
         if Section <> cbsVariable then begin
           EmitLn;
+          Dec(Indetation);
           EmitLn('var');
+          Inc(Indetation);
         end;
         GenerateVariable(TVariable(Order[I]));
@@ -477 +482 @@
         if Section <> cbsConstant then begin
           EmitLn;
+          Dec(Indetation);
           EmitLn('const');
+          Inc(Indetation);
         end;
         GenerateConstant(TConstant(Order[I]));
@@ -488 +495 @@
     GenerateBeginEnd(Code);
   end;
+  Dec(Indetation);
 end;