Changeset 43 for branches/DelphiToC/Analyze/UPascalParser.pas

Timestamp:

Aug 5, 2010, 4:17:18 PM (14 years ago)

Author:

george

Message:

End parsing process on reaching data end.

File:

• branches/DelphiToC/Analyze/UPascalParser.pas (modified) (9 diffs)

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -10 +10 @@
 
 type
+  EEndOfData = class(Exception);
+
   TPascalParser = class;
 
@@ -24 +26 @@
   TParserExpression = class
     class function Parse(Parser: TPascalParser; SourceCode: TExpression): TExpression;
+  end;
+
+  { TParserUsedModuleList }
+
+  TParserUsedModuleList = class
+    class procedure Parse(Parser: TPascalParser; SourceCode: TUsedModuleList);
   end;
 
@@ -108 +116 @@
   SRedefineIdentifier = 'Identificator "%s" redefinition.';
   STypeNotDefined = 'Type "%s" not defined.';
+  SEndOfDataReached = 'Parser reached to end of input data.';
+
 
 { TPascalParser }
@@ -122 +132 @@
   if NextCode <> Code then begin
     ErrorMessage(SExpectedButFound, [Code, NextCode]);
+
+    // Recovery: try to find nearest same code
+    while NextCode <> Code do
+      ReadCode;
   end;
   ReadCode;
@@ -210 +224 @@
   with SourceCodeText do
   while Result = '' do begin
-    while IsWhiteSpace(Text[I]) do Inc(I);
+    while IsWhiteSpace(Text[I]) and (I < Length(Text)) do Inc(I);
+    if I = Length(Text) then
+      raise EEndOfData.Create(SEndOfDataReached);
     J := I;
-    if Copy(Text, J, 1) = '//' then begin
+    if Copy(Text, J, 2) = '//' then begin
+      // Line comment
       while (Text[I] <> #13) and (Text[I] <> #10) do Inc(I);
       Result := '';
     end else
     if Copy(Text, J, 1) = '{' then begin
+      // Block comment 1
       while (Text[I] <> '}') do Inc(I);
       Result := '';
     end else
-    if Copy(Text, J, 1) = '(*' then begin
+    if Copy(Text, J, 2) = '(*' then begin
+      // Block comment 2
       while not((Text[I] = '*') and (Text[I + 1] = ')')) do Inc(I);
       Result := '';
     end else
     if Text[J] = '''' then begin
+      // String constant
       I := J + 1;
       while not ((Text[I] = '''') and (Text[I + 1] <> '''')) do Inc(I);
       Inc(I);
-      Result := Copy(Text, J, I - J );
+      Result := Copy(Text, J, I - J);
     end else
     if (Text[J] in SpecChar) then begin
+      // Special char token
       if (Text[J + 1] in SpecChar) then begin
         for II := 0 to High(DoubleSpecChar) do
@@ -245 +266 @@
       end;
     end else begin
-      while IsAlphanumeric(Text[I]) do Inc(I);
-      Result := LowerCase(Copy(Text, J, I - J));
+      if IsAlphabetic(Text[I]) then begin
+        // Identifier
+        while IsAlphanumeric(Text[I]) do Inc(I);
+        Result := Copy(Text, J, I - J);
+      end else begin
+        while not IsWhiteSpace(Text[I]) do Inc(I);
+        Result := Copy(Text, J, I - J);
+      end;
     end;
     J := I;
@@ -472 +499 @@
     end;
   end;
-
-(*    begin
-      Expect('if');
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inConditionalJump;
-        ExpressionTree := ParseCommonBlockExpression(CommonBlock);
-        Negative := True;
-      end;
-      First := Operations[Operations.Count - 1];
-      Expect('then');
-      ParseCommonBlockOperation(CommonBlock);
-      if NextCode = 'else' then begin
-        with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-          Instruction := inJump;
-        end;
-        Second := Operations[Operations.Count - 1];
-        First.GotoAddress := Operations.Count;
-        Expect('else');
-        ParseCommonBlockOperation(CommonBlock);
-        Second.GotoAddress := Operations.Count;
-      end else First.GotoAddress := Operations.Count;
-    end
-    else if NextCode = 'repeat' then begin
-      Expect('repeat');
-      StartIndex := Operations.Count;
-      ParseCommonBlockOperation(CommonBlock);
-      Expect('until');
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inConditionalJump;
-        ExpressionTree := ParseCommonBlockExpression(CommonBlock);
-        GotoAddress := StartIndex;
-      end;
-    end
-    else if NextCode = 'while' then begin
-      Expect('while');
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inConditionalJump;
-        ExpressionTree := ParseCommonBlockExpression(CommonBlock);
-      end;
-      First := Operations[Operations.Count - 1];
-      StartIndex := Operations.Count - 1;
-      Expect('do');
-      ParseCommonBlockOperation(CommonBlock);
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inJump;
-        GotoAddress := StartIndex;
-      end;
-      First.GotoAddress := Operations.Count;
-    end
-    else if NextCode = 'for' then begin
-      Expect('for');
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inExpressionEvaluation;
-        ExpressionTree := ParseCommonBlockExpression(CommonBlock);
-        if (ExpressionTree.NodeType <> ntOperator) and
-          (ExpressionTree.OperatorName <> ':=') then ErrorMessage('Expected assigment in for loop');
-        if TExpression(TExpression(ExpressionTree).SubItems[0]).NodeType <> ntVariable then
-          ErrorMessage('Index in FOR loop have to be variable');
-        LoopVaraible := TExpression(TExpression(ExpressionTree).SubItems[0]).Variable;
-      end;
-      Expect('to');
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inExpressionEvaluation;
-        ExpressionTree := TExpression.Create;
-        with ExpressionTree do begin
-          NodeType := ntOperator;
-          OperatorName := '=';
-          SubItems[0] := TExpression.Create;
-          with TExpression(SubItems[0]) do begin
-            NodeType := ntVariable;
-            Variable := LoopVaraible;
-          end;
-          SubItems[1] := ParseCommonBlockExpression(CommonBlock);
-        end;
-        Negative := True;
-      end;
-      First := Operations[Operations.Count - 1];
-      StartIndex := Operations.Count - 1;
-      Expect('do');
-      ParseCommonBlockOperation(CommonBlock);
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inExpressionEvaluation;
-        ExpressionTree := TExpression.Create;
-        with ExpressionTree do begin
-          NodeType := ntOperator;
-          OperatorName := ':=';
-          SubItems[0] := TExpression.Create;
-          with TExpression(SubItems[0]) do begin
-            NodeType := ntVariable;
-            Variable := LoopVaraible;
-          end;
-          SubItems[1] := TExpression.Create;
-          with TExpression(SubItems[1]) do begin
-            NodeType := ntOperator;
-            OperatorName := '+';
-            SubItems[0] := TExpression.Create;
-            with TExpression(SubItems[0]) do begin
-              NodeType := ntVariable;
-              Variable := LoopVaraible;
-            end;
-            SubItems[1] := TExpression.Create;
-            with TExpression(SubItems[1]) do begin
-              NodeType := ntConstant;
-              //SetLength(Value, 1);
-              //Value[0] := 1;
-              Value := 1;
-            end;
-          end;
-        end;
-      end;
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inJump;
-        GotoAddress := StartIndex;
-      end;
-      First.GotoAddress := Operations.Count;
-    end
-    else begin
-      with TOperation(Operations[Operations.Add(TOperation.Create)]) do begin
-        Instruction := inExpressionEvaluation;
-        ExpressionTree := ParseCommonBlockExpression(CommonBlock);
-      end;
-    end;
-  *)
 end;
 
@@ -623 +527 @@
 
     // Uses section
-    if NextCode = 'uses' then begin
-      Identifier := ReadCode;
-      while NextCode = ',' do begin
-        Identifier := ReadCode;
-
-      end;
-    end;
+    if NextCode = 'uses' then
+      TParserUsedModuleList.Parse(Parser, UsedModules);
+
     TParserCommonBlock.Parse(Parser, SourceCode, '.');
   end;
@@ -912 +812 @@
 end;
 
+{ TParserUsedModuleList }
+
+class procedure TParserUsedModuleList.Parse(Parser: TPascalParser;
+  SourceCode: TUsedModuleList);
+var
+  NewUsedModule: TUsedModule;
+begin
+  with Parser do begin
+    Expect('uses');
+    with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do begin
+      Name := ReadCode;
+    end;
+    while NextCode = ',' do begin
+      Expect(',');
+      with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do begin
+        Name := ReadCode;
+      end;
+    end;
+    Expect(';');
+  end;
+end;
+
 end.