Changeset 8 for trunk/Compiler/Analyze/UPascalParser.pas

Timestamp:

Nov 8, 2010, 7:06:20 AM (14 years ago)

Author:

george

Message:

• Added: Support for type value.

File:

• trunk/Compiler/Analyze/UPascalParser.pas (modified) (1 diff)

trunk/Compiler/Analyze/UPascalParser.pas

@@ -249 +249 @@
       if (UseType is TTypeRecord) or (UseType is TTypeClass) then begin
         // Type context
-        Expect('.');
-        Identifier := ReadToken;
-        UseVariable := TTypeRecord(UseType).CommonBlock.Variables.Search(Identifier);
-        if Assigned(UseVariable) then begin
-          // Record or class variable
+        if NextToken = '.' then begin
+          Expect('.');
+          Identifier := ReadToken;
+          UseVariable := TTypeRecord(UseType).CommonBlock.Variables.Search(Identifier);
+          if Assigned(UseVariable) then begin
+            // Record or class variable
+            NewExpression := TExpression.Create;
+            NewExpression.CommonBlock := SourceCode.CommonBlock;
+            NewExpression.NodeType := ntVariable;
+            NewExpression.Variable := UseVariable;
+          end;
+          if not Assigned(NewExpression) then begin
+            UseFunction := TTypeRecord(UseType).CommonBlock.Functions.Search(Identifier);
+            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;
+            end;
+          end;
+          if not Assigned(NewExpression) then
+            ErrorMessage(SUndefinedVariable, [Identifier]);
+        end else begin
           NewExpression := TExpression.Create;
           NewExpression.CommonBlock := SourceCode.CommonBlock;
-          NewExpression.NodeType := ntVariable;
-          NewExpression.Variable := UseVariable;
-        end;
-        if not Assigned(NewExpression) then begin
-          UseFunction := TTypeRecord(UseType).CommonBlock.Functions.Search(Identifier);
-          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;
-          end;
-        end;
-        if not Assigned(NewExpression) then
-          ErrorMessage(SUndefinedVariable, [Identifier]);
+          NewExpression.NodeType := ntType;
+          NewExpression.UseType := UseType;
+        end;
       end else ErrorMessage(SIllegalExpression, [Identifier]);
     end;