Changeset 74 for branches/Transpascal/Compiler/Analyze/UPascalParser.pas

Timestamp:

Oct 20, 2010, 1:57:17 PM (14 years ago)

Author:

george

Message:

• Minor fixes.

File:

• branches/Transpascal/Compiler/Analyze/UPascalParser.pas (modified) (20 diffs)

branches/Transpascal/Compiler/Analyze/UPascalParser.pas

@@ -51 +51 @@
   SIllegalExpression = 'Illegal expression "%s".';
   SRedefineIdentifier = 'Identificator "%s" redefinition.';
-  STypeNotDefined = 'Type "%s" not defined.';
   SEndOfDataReached = 'Parser reached to end of input data.';
   SUndefinedVariable = 'Undefined variable "%s".';
@@ -109 +108 @@
   NewVariable: TVariable;
   NewExpression: TExpression;
-  Method: TFunction;
+  NewMethod: TFunction;
   Constant: TConstant;
   //  Brackets: Integer;
@@ -127 +126 @@
         with TExpression(Expressions.Last) do begin
           SubItems[1] := TExpression.Create;
+          TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
           ParseExpression(TExpression(SubItems[1]));
         end;
@@ -148 +148 @@
           with TExpression(Expressions.Last) do begin
             SubItems[1] := TExpression.Create;
+            TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
             TExpression(SubItems[1]).NodeType := ntVariable;
             TExpression(SubItems[1]).Variable := NewVariable;
@@ -157 +158 @@
           end;
         end else begin
-          Method := CommonBlock.Functions.Search(Identifier);
-          if Assigned(Method) then
-          begin
+          NewMethod := CommonBlock.Functions.Search(Identifier);
+          if Assigned(NewMethod) then begin
             // Referenced method
             with TExpression(Expressions.Last) do begin
               SubItems[1] := TExpression.Create;
+              TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
               if NextToken = '(' then               // Method with parameters
                 with TExpression(SubItems[1]) do begin
@@ -180 +181 @@
                 end;
               TExpression(SubItems[1]).NodeType := ntFunction;
-              TExpression(SubItems[1]).Method := Method;
+              TExpression(SubItems[1]).Method := NewMethod;
             end;
             with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
@@ -194 +195 @@
               with TExpression(Expressions.Last) do begin
                 SubItems[1] := TExpression.Create;
+                TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
                 TExpression(SubItems[1]).NodeType := ntConstant;
                 TExpression(SubItems[1]).Value := Constant.Value;
@@ -210 +212 @@
       end else begin
         // Constant value
-        with TExpression(Expressions.Last) do
-        begin
+        with TExpression(Expressions.Last) do begin
           SubItems[1] := TExpression.Create;
           TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
@@ -383 +384 @@
   if NextToken = 'implementation' then
     ParseUnitImplementation(SourceCode);
+
+  if NextToken = 'initialization' then begin
+    Expect('initialization');
+  end;
+  if NextToken = 'finalization' then begin
+    Expect('finalization');
+  end;
 end;
 
@@ -411 +419 @@
   EndSymbol: char = ';');
 begin
-  with SourceCode do
-  begin
-    while NextToken <> EndSymbol do
-    begin
+  with SourceCode do begin
+    while (NextToken <> EndSymbol) do begin
       if NextToken = 'var' then
         ParseVariableList(Variables)
@@ -425 +431 @@
       else if NextToken = 'function' then
         ParseFunctionList(Functions)
-      else
-      begin
+      else begin
         ParseBeginEnd(Code);
         Break;
@@ -525 +530 @@
                 end;
               end else
-                ErrorMessage(SRedefineIdentifier, [VariableName], 0);
+                ErrorMessage(SRedefineIdentifier, [VariableName], -1);
               Expect(':');
               TypeName := ReadCode;
               NewValueType := Parent.Types.Search(TypeName);
               if not Assigned(NewValueType) then
-                ErrorMessage(STypeNotDefined, [TypeName], -1)
+                ErrorMessage(SUndefinedType, [TypeName], -1)
               else
                 for I := 0 to Identifiers.Count - 1 do
@@ -550 +555 @@
           NewValueType := Parent.Types.Search(TypeName);
           if not Assigned(NewValueType) then
-            ErrorMessage(STypeNotDefined, [TypeName], -1)
+            ErrorMessage(SUndefinedType, [TypeName], -1)
           else
           begin
@@ -607 +612 @@
     ControlVariable := SourceCode.CommonBlock.Variables.Search(VariableName);
     if not Assigned(ControlVariable) then
-      ErrorMessage(SUndefinedVariable, [VariableName], 0);
+      ErrorMessage(SUndefinedVariable, [VariableName], -1);
     Expect(':=');
     Start.CommonBlock := CommonBlock;
@@ -645 +650 @@
         end;
       end else
-        ErrorMessage(SRedefineIdentifier, [VariableName], 0);
+        ErrorMessage(SRedefineIdentifier, [VariableName], -1);
       Expect(':');
       TypeName := ReadCode;
       NewValueType := Parent.Types.Search(TypeName);
       if NewValueType = nil then
-        ErrorMessage(STypeNotDefined, [TypeName], -1)
+        ErrorMessage(SUndefinedType, [TypeName], -1)
       else
         for I := 0 to Identifiers.Count - 1 do
@@ -706 +711 @@
       end
       else
-        ErrorMessage(SRedefineIdentifier, [ConstantName], 0);
+        ErrorMessage(SRedefineIdentifier, [ConstantName], -1);
       Expect(':');
       TypeName := ReadCode;
@@ -715 +720 @@
 
       if NewValueType = nil then
-        ErrorMessage(STypeNotDefined, [TypeName], -1)
+        ErrorMessage(SUndefinedType, [TypeName], -1)
       else
         for I := 0 to Identifiers.Count - 1 do
@@ -792 +797 @@
         TTypeArray(Result).IndexType := ParseType(TypeList, False);
         if not Assigned(TTypeArray(Result).IndexType) then
-          ErrorMessage(SUndefinedType, [TypeName], 0);
+          ErrorMessage(SUndefinedType, [TypeName], -1);
         Expect(']');
       end;
@@ -799 +804 @@
       TTypeArray(Result).ItemType := ParseType(TypeList, False);
       if not Assigned(TTypeArray(Result).ItemType) then
-        ErrorMessage(SUndefinedType, [TypeName], 0);
+        ErrorMessage(SUndefinedType, [TypeName], -1);
     end else
     if NextToken = '^' then begin
@@ -826 +831 @@
         TType(Result).UsedType := TypeList.Search(TypeName);
         if not Assigned(TType(Result).UsedType) then
-          ErrorMessage(SUndefinedType, [TypeName], 0);
+          ErrorMessage(SUndefinedType, [TypeName], -1);
       end else begin
         TType(Result) := TypeList.Search(TypeName);
         if not Assigned(TType(Result)) then
-          ErrorMessage(SUndefinedType, [TypeName], 0);
+          ErrorMessage(SUndefinedType, [TypeName], -1);
       end;
     end;