Changeset 1016 for trunk/source/intercoms/src/G4UIbatch.cc

Timestamp:

Apr 22, 2009, 12:38:42 PM (15 years ago)

Author:

garnier

Message:

update

File:

• trunk/source/intercoms/src/G4UIbatch.cc (modified) (7 diffs)

trunk/source/intercoms/src/G4UIbatch.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4UIbatch.cc,v 1.16 2007/08/10 09:46:10 kmura Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4UIbatch.cc,v 1.17 2008/11/21 10:54:16 kmura Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ====================================================================
@@ -45 +45 @@
   
   while (pos != G4String::npos || pos0 != G4String::npos) {
+    if (str[pos0] == '\"') {
+      pos = str.find_first_of("\"", pos0+1);
+      if(pos != G4String::npos) pos++;
+    }
+    if (str[pos0] == '\'') {
+      pos = str.find_first_of("\'", pos0+1);
+      if(pos != G4String::npos) pos++;
+    }
+
     tokens.push_back(str.substr(pos0, pos-pos0));
-
     pos0 = str.find_first_not_of(delimiter, pos);
     pos = str.find_first_of(delimiter, pos0);
@@ -110 +118 @@
     if(!qcontinued && cmdline.size()==0) continue;
 
+    // '#' is treated as echoing something
+    if(cmdline[(size_t)0]=='#') return cmdline;
+
     // tokenize...
     std::vector<G4String> tokens;
@@ -115 +126 @@
     qcontinued= false;
     for (G4int i=0; i< G4int(tokens.size()); i++) {
+      // string after '#" is ignored
+      if(tokens[i][(size_t)0] == '#' ) break;
       // '\' or '_' is treated as continued line.
       if(tokens[i] == '\\' || tokens[i] == '_' ) {
@@ -129 +142 @@
     }
 
-    if(qcontinued) continue; // read` the next line
+    if(qcontinued) continue; // read the next line
 
     if(cmdtotal.size() != 0) break;
@@ -137 +150 @@
   // strip again
   cmdtotal= cmdtotal.strip(G4String::both);
-
-  // '#' is treated as echoing something
-  if(cmdtotal[(size_t)0]=='#') return cmdtotal;
-
-  // normally something after # is treated just as comment and ignored
-  str_size ic= cmdtotal.find_first_of('#');
-  if(ic != G4String::npos) {
-    cmdtotal= cmdtotal(0, ic);
-  }
 
   // finally,
@@ -153 +157 @@
 
   return cmdtotal;
-
 }