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

Timestamp:

Oct 20, 2010, 11:02:10 AM (14 years ago)

Author:

george

Message:

• Fixed: Better error message cursor position focusing.
• Modified: All source code is tokenized to token list at once.

File:

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

branches/Transpascal/Compiler/Analyze/UPascalParser.pas

@@ -47 +47 @@
 
 
+resourcestring
+  SUnknownIdentifier = 'Unknown identificator "%s".';
+  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".';
+  SUndefinedType = 'Undefined type "%s".';
+  SUndefinedConstant = 'Undefined constant "%s".';
+  SUnitNotFound = 'Unit "%s" not found.';
+
+
 implementation
 
@@ -63 +75 @@
     if Assigned(OnGetSource) then begin
       if FOnGetSource(Name, Parser.SourceCodeText) then begin
-        Parser.Init;
+        Parser.Process;
         Parser.FileName := Name;
         Parser.OnErrorMessage := OnErrorMessage;
@@ -192 +204 @@
               end;
             end else begin
-              ErrorMessage(SUnknownIdentifier, [Identifier]);
+              ErrorMessage(SUnknownIdentifier, [Identifier], -1);
             end;
           end;
@@ -326 +338 @@
       begin
         Result := nil;
-        ErrorMessage(SUnknownIdentifier, [ReadCode]);
+        ErrorMessage(SUnknownIdentifier, [ReadCode], -1);
       end;
     end
@@ -334 +346 @@
     begin
       Result := nil;
-      ErrorMessage(SIllegalExpression, [ReadCode]);
+      ErrorMessage(SIllegalExpression, [ReadCode], -1);
     end;
   end;
@@ -454 +466 @@
         ParseFunctionList(Functions, True)
       else begin
-        ErrorMessage(SUnknownIdentifier, [NextToken]);
+        ErrorMessage(SUnknownIdentifier, [NextToken], -1);
         ReadCode;
       end;
@@ -529 +541 @@
                 end;
               end else
-                ErrorMessage(SRedefineIdentifier, [VariableName]);
+                ErrorMessage(SRedefineIdentifier, [VariableName], 0);
               Expect(':');
               TypeName := ReadCode;
               NewValueType := Parent.Types.Search(TypeName);
               if not Assigned(NewValueType) then
-                ErrorMessage(STypeNotDefined, [TypeName])
+                ErrorMessage(STypeNotDefined, [TypeName], -1)
               else
                 for I := 0 to Identifiers.Count - 1 do
@@ -554 +566 @@
           NewValueType := Parent.Types.Search(TypeName);
           if not Assigned(NewValueType) then
-            ErrorMessage(STypeNotDefined, [TypeName])
+            ErrorMessage(STypeNotDefined, [TypeName], -1)
           else
           begin
@@ -611 +623 @@
     ControlVariable := SourceCode.CommonBlock.Variables.Search(VariableName);
     if not Assigned(ControlVariable) then
-      ErrorMessage(SUndefinedVariable, [VariableName]);
+      ErrorMessage(SUndefinedVariable, [VariableName], 0);
     Expect(':=');
     Start.CommonBlock := CommonBlock;
@@ -653 +665 @@
       end
       else
-        ErrorMessage(SRedefineIdentifier, [VariableName]);
+        ErrorMessage(SRedefineIdentifier, [VariableName], 0);
       Expect(':');
       TypeName := ReadCode;
       NewValueType := Parent.Types.Search(TypeName);
       if NewValueType = nil then
-        ErrorMessage(STypeNotDefined, [TypeName])
+        ErrorMessage(STypeNotDefined, [TypeName], -1)
       else
         for I := 0 to Identifiers.Count - 1 do
@@ -714 +726 @@
       end
       else
-        ErrorMessage(SRedefineIdentifier, [ConstantName]);
+        ErrorMessage(SRedefineIdentifier, [ConstantName], 0);
       Expect(':');
       TypeName := ReadCode;
@@ -723 +735 @@
 
       if NewValueType = nil then
-        ErrorMessage(STypeNotDefined, [TypeName])
+        ErrorMessage(STypeNotDefined, [TypeName], -1)
       else
         for I := 0 to Identifiers.Count - 1 do
@@ -800 +812 @@
         TTypeArray(Result).IndexType := ParseType(TypeList, False);
         if not Assigned(TTypeArray(Result).IndexType) then
-          ErrorMessage(SUndefinedType, [TypeName]);
+          ErrorMessage(SUndefinedType, [TypeName], 0);
         Expect(']');
       end;
@@ -807 +819 @@
       TTypeArray(Result).ItemType := ParseType(TypeList, False);
       if not Assigned(TTypeArray(Result).ItemType) then
-        ErrorMessage(SUndefinedType, [TypeName]);
+        ErrorMessage(SUndefinedType, [TypeName], 0);
     end else
     if NextToken = '^' then begin
@@ -834 +846 @@
         TType(Result).UsedType := TypeList.Search(TypeName);
         if not Assigned(TType(Result).UsedType) then
-          ErrorMessage(SUndefinedType, [TypeName]);
+          ErrorMessage(SUndefinedType, [TypeName], 0);
       end else begin
         TType(Result) := TypeList.Search(TypeName);
         if not Assigned(TType(Result)) then
-          ErrorMessage(SUndefinedType, [TypeName]);
+          ErrorMessage(SUndefinedType, [TypeName], 0);
       end;
     end;
@@ -922 +934 @@
 constructor TPascalParser.Create;
 begin
+  inherited;
 end;
 
@@ -949 +962 @@
         Exported := AExported;
       end else begin
-        ErrorMessage(SUnitNotFound, [Name]);
+        ErrorMessage(SUnitNotFound, [Name], -2);
         SourceCode.Delete(SourceCode.Count - 1);
       end;
@@ -966 +979 @@
       if not Assigned(Module) then begin
         if not ParseFile(Name) then begin
-          ErrorMessage(SUnitNotFound, [Name]);
+          ErrorMessage(SUnitNotFound, [Name], -2);
           SourceCode.Delete(SourceCode.Count - 1);
         end;