[JVCL-Checkins] SF.net SVN: jvcl: [10546] trunk/jvcl/run/JvInterpreter.pas

[<ob...@us...>]

Revision: 10546
Author:   obones
Date:     2006-04-21 02:23:48 -0700 (Fri, 21 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/jvcl/?rev=10546&view=rev

Log Message:
-----------
Mantis 3600

Modified Paths:
--------------
    trunk/jvcl/run/JvInterpreter.pas
Modified: trunk/jvcl/run/JvInterpreter.pas
===================================================================
--- trunk/jvcl/run/JvInterpreter.pas	2006-04-21 07:46:26 UTC (rev 10545)
+++ trunk/jvcl/run/JvInterpreter.pas	2006-04-21 09:23:48 UTC (rev 10546)
@@ -5211,10 +5211,12 @@
   function Expression(const OpTyp: TTokenKind): Variant;
   var
     Tmp: Variant;
+    PrevTTyp: Integer;
   begin
     Result := Unassigned;
     if OpTyp <> ttUnknown then
       NextToken;
+    PrevTTyp := TTyp;
     while True do
     begin
       case TTyp of
@@ -5390,7 +5392,7 @@
             NextToken;
           end;
         ttRB:
-          if TVarData(Result).VType = varEmpty then
+          if (TVarData(Result).VType = varEmpty) and (PrevTTyp <> ttIdentifier) then
             ErrorExpected(LoadStr2(irExpression))
           else
             Exit;
@@ -5403,12 +5405,12 @@
             NextToken;
           end;
         ttRS:
-          if TVarData(Result).VType = varEmpty then
+          if (TVarData(Result).VType = varEmpty) and (PrevTTyp <> ttIdentifier) then
             ErrorExpected(LoadStr2(irExpression))
           else
             Exit;
       else
-        if TVarData(Result).VType = varEmpty then
+        if (TVarData(Result).VType = varEmpty) and (PrevTTyp <> ttIdentifier) then
           ErrorExpected(LoadStr2(irExpression))
         else
           Exit;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.