From: akl <akl@opencascade.com>
Date: Fri, 19 Dec 2008 11:19:09 +0000 (+0000)
Subject: To correct parsing of commands like object.command(obj, 'str=value'),
X-Git-Tag: V4_1_5rc1~51
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=b96c803ff5a240c31f87c88b84cd4b8844a6ce68

To correct parsing of commands like object.command(obj, 'str=value'),
when '=' character takes place between '' or "" symbols.
---

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index 2277fc967..157e0f41c 100644
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -1712,8 +1712,22 @@ const TCollection_AsciiString & _pyCommand::GetObject()
   {
     // beginning
     int begPos = GetBegPos( RESULT_IND ) + myRes.Length();
-    if ( begPos < 1 )
+    if ( begPos < 1 ) {
       begPos = myString.Location( "=", 1, Length() ) + 1;
+      // is '=' in the string argument (for example, name) or not
+      int nb1 = 0; // number of ' character at the left of =
+      int nb2 = 0; // number of " character at the left of =
+      for ( int i = 1; i < begPos-1; i++ ) {
+	if ( IsEqual(myString.Value( i ), "'" ) )
+	  nb1 += 1;
+	else if ( IsEqual( myString.Value( i ), '"' ) )
+	  nb2 += 1;
+      }
+      // if number of ' or " is not divisible by 2,
+      // then get an object at the start of the command
+      if ( nb1 % 2 != 0 || nb2 % 2 != 0 )
+	begPos = 1;
+    }
     // store
     myObj = GetWord( myString, begPos, true );
     SetBegPos( OBJECT_IND, begPos );