New upstream version 4.1.0upstream/4.1.0

1 files changed, 30 insertions, 1 deletions

diff --git a/src/core/xbexp.cpp b/src/core/xbexp.cpp
index 23bc7c6..deea53d 100755
--- a/src/core/xbexp.cpp
+++ b/src/core/xbexp.cpp
@@ -669,10 +669,22 @@ xbInt16 xbExp::GetTokenDatabaseField( xbExpToken &t ){
   }
 
   // look for ->
-  // remove the field name from before the ->
+  // remove the table name from before the ->
   if( strncmp( s, "->", 2 ) == 0 ){
     ulTokenLen2+=2;
     s+=2;
+
+/*
+  if( strncmp( s, "->", 2 ) == 0 || strncmp( s, ".", 1 ) == 0){
+    if( *s == '.' ){
+      ulTokenLen2+=1;
+      s+=1;
+    } else {
+      ulTokenLen2+=2;
+      s+=2;
+    }
+*/
+
     // go past white space
     while( *s && !IsTokenSeparator( *s ) && IsWhiteSpace( *s )) {
       ulTokenLen2++;
@@ -1489,6 +1501,7 @@ xbInt16 xbExp::ParseExpressionField( xbExpToken &t, xbExpNode *n ){
   try{
 
     xbUInt32 lPos;
+
     if(( lPos = t.sToken.Pos( "->" )) > 0 ){
       //  table name is part of the token
       xbString sTableName = t.sToken;
@@ -1496,6 +1509,22 @@ xbInt16 xbExp::ParseExpressionField( xbExpToken &t, xbExpNode *n ){
       sFieldName = t.sToken;
       sFieldName.Mid( lPos + 2, t.sToken.Len() - lPos - 1 );
       pDbf = (xbDbf *) xbase->GetDbfPtr( sTableName );
+
+
+/*
+    //  updated 1/2/23 to support either table.field or table->field
+    if((( lPos = t.sToken.Pos( "->" )) > 0) || (( lPos = t.sToken.Pos( "." )) > 0) ){
+      //  table name is part of the token
+      xbString sTableName = t.sToken;
+      sTableName.Left( lPos-1 );
+      sFieldName = t.sToken;
+      if( t.sToken[lPos] == '.' )
+        sFieldName.Mid( lPos + 1, t.sToken.Len() - lPos );
+      else  // ->
+        sFieldName.Mid( lPos + 2, t.sToken.Len() - lPos - 1 );
+      pDbf = (xbDbf *) xbase->GetDbfPtr( sTableName );
+*/
+
     } else {
       // table name is not part of the token 
       pDbf = dbf;