Changeset 1016 for trunk/source

Timestamp:

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

Author:

garnier

Message:

update

Location:

trunk/source/intercoms

Files:

• History (modified) (2 diffs)
• include/G4UIaliasList.hh (modified) (1 diff)
• include/G4UIbatch.hh (modified) (1 diff)
• include/G4UIcmdWith3Vector.hh (modified) (1 diff)
• include/G4UIcmdWith3VectorAndUnit.hh (modified) (1 diff)
• include/G4UIcmdWithABool.hh (modified) (1 diff)
• include/G4UIcmdWithADouble.hh (modified) (1 diff)
• include/G4UIcmdWithADoubleAndUnit.hh (modified) (1 diff)
• include/G4UIcmdWithAString.hh (modified) (1 diff)
• include/G4UIcmdWithAnInteger.hh (modified) (1 diff)
• include/G4UIcmdWithoutParameter.hh (modified) (1 diff)
• include/G4UIcommand.hh (modified) (1 diff)
• include/G4UIcommandStatus.hh (modified) (1 diff)
• include/G4UIcommandTree.hh (modified) (1 diff)
• include/G4UIcontrolMessenger.hh (modified) (1 diff)
• include/G4UIdirectory.hh (modified) (1 diff)
• include/G4UImanager.hh (modified) (1 diff)
• include/G4UImessenger.hh (modified) (1 diff)
• include/G4UIparameter.hh (modified) (1 diff)
• include/G4UIsession.hh (modified) (1 diff)
• include/G4UItokenNum.hh (modified) (1 diff)
• include/G4UnitsMessenger.hh (modified) (1 diff)
• include/G4VFlavoredParallelWorld.hh (modified) (1 diff)
• include/G4VGlobalFastSimulationManager.hh (modified) (1 diff)
• src/G4UIaliasList.cc (modified) (1 diff)
• src/G4UIbatch.cc (modified) (7 diffs)
• src/G4UIcmdWith3Vector.cc (modified) (1 diff)
• src/G4UIcmdWith3VectorAndUnit.cc (modified) (1 diff)
• src/G4UIcmdWithABool.cc (modified) (1 diff)
• src/G4UIcmdWithADouble.cc (modified) (1 diff)
• src/G4UIcmdWithADoubleAndUnit.cc (modified) (1 diff)
• src/G4UIcmdWithAString.cc (modified) (1 diff)
• src/G4UIcmdWithAnInteger.cc (modified) (1 diff)
• src/G4UIcmdWithoutParameter.cc (modified) (1 diff)
• src/G4UIcommand.cc (modified) (1 diff)
• src/G4UIcommandTree.cc (modified) (1 diff)
• src/G4UIcontrolMessenger.cc (modified) (1 diff)
• src/G4UIdirectory.cc (modified) (1 diff)
• src/G4UImanager.cc (modified) (1 diff)
• src/G4UImessenger.cc (modified) (1 diff)
• src/G4UIparameter.cc (modified) (1 diff)
• src/G4UIsession.cc (modified) (1 diff)
• src/G4UnitsMessenger.cc (modified) (1 diff)
• src/G4VGlobalFastSimulationManager.cc (modified) (1 diff)

trunk/source/intercoms/History

@@ -1 @@
-$Id: History,v 1.72 2008/06/14 17:41:39 kmura Exp $
+$Id: History,v 1.73 2008/11/21 10:57:25 kmura Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+21 November, 2008 K.Murakami (intercoms-V09-01-01)
+ - fix improper comment treatment for line continue characters
+   in G4UIbatch. [Problem-1034]
+ - tagged for release 9.2
 
 14 June 2008 K.Murakami (intercoms-V09-01-00)

trunk/source/intercoms/include/G4UIaliasList.hh

@@ -26 +26 @@
 //
 // $Id: G4UIaliasList.hh,v 1.6 2006/06/29 19:07:42 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/include/G4UIbatch.hh

@@ -25 +25 @@
 //
 // $Id: G4UIbatch.hh,v 1.10 2007/07/16 10:15:12 kmura Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ====================================================================

trunk/source/intercoms/include/G4UIcmdWith3Vector.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWith3Vector.hh,v 1.7 2006/06/29 19:07:47 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.8 2006/06/29 19:07:49 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWithABool.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithABool.hh,v 1.7 2006/06/29 19:07:51 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWithADouble.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithADouble.hh,v 1.7 2006/06/29 19:07:54 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.8 2006/06/29 19:07:57 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWithAString.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithAString.hh,v 1.5 2006/06/29 19:07:59 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWithAnInteger.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithAnInteger.hh,v 1.7 2006/06/29 19:08:01 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcmdWithoutParameter.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithoutParameter.hh,v 1.5 2006/06/29 19:08:03 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UIcommand.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcommand.hh,v 1.15 2006/06/29 19:08:05 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/include/G4UIcommandStatus.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcommandStatus.hh,v 1.5 2006/06/29 19:08:08 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/include/G4UIcommandTree.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcommandTree.hh,v 1.16 2008/01/30 11:20:03 lgarnier Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/include/G4UIcontrolMessenger.hh

@@ -26 +26 @@
 //
 // $Id: G4UIcontrolMessenger.hh,v 1.12 2007/06/06 15:14:51 asaim Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/include/G4UIdirectory.hh

@@ -26 +26 @@
 //
 // $Id: G4UIdirectory.hh,v 1.5 2006/06/29 19:08:15 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/include/G4UImanager.hh

@@ -26 +26 @@
 //
 // $Id: G4UImanager.hh,v 1.21 2006/06/29 19:08:17 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/include/G4UImessenger.hh

@@ -26 +26 @@
 //
 // $Id: G4UImessenger.hh,v 1.9 2006/06/29 19:08:19 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/include/G4UIparameter.hh

@@ -26 +26 @@
 //
 // $Id: G4UIparameter.hh,v 1.9 2006/06/29 19:08:21 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/include/G4UIsession.hh

@@ -26 +26 @@
 //
 // $Id: G4UIsession.hh,v 1.5 2006/06/29 19:08:23 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // $id$

trunk/source/intercoms/include/G4UItokenNum.hh

@@ -26 +26 @@
 //
 // $Id: G4UItokenNum.hh,v 1.8 2006/06/29 19:08:25 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // G4UItokenNum.hh

trunk/source/intercoms/include/G4UnitsMessenger.hh

@@ -26 +26 @@
 //
 // $Id: G4UnitsMessenger.hh,v 1.5 2006/06/29 19:08:27 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // class description

trunk/source/intercoms/include/G4VFlavoredParallelWorld.hh

@@ -26 +26 @@
 //
 // $Id: G4VFlavoredParallelWorld.hh,v 1.5 2006/11/03 17:44:40 mverderi Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/include/G4VGlobalFastSimulationManager.hh

@@ -26 +26 @@
 //
 // $Id: G4VGlobalFastSimulationManager.hh,v 1.5 2006/06/29 19:08:31 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/src/G4UIaliasList.cc

@@ -26 +26 @@
 //
 // $Id: G4UIaliasList.cc,v 1.6 2006/06/29 19:08:33 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

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;
-
 }
 

trunk/source/intercoms/src/G4UIcmdWith3Vector.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWith3Vector.cc,v 1.8 2006/06/29 19:08:38 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.9 2006/06/29 19:08:41 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWithABool.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithABool.cc,v 1.8 2006/06/29 19:08:43 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWithADouble.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithADouble.cc,v 1.8 2006/06/29 19:08:45 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.9 2006/06/29 19:08:48 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWithAString.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithAString.cc,v 1.6 2006/06/29 19:08:50 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWithAnInteger.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithAnInteger.cc,v 1.8 2006/06/29 19:08:52 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcmdWithoutParameter.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcmdWithoutParameter.cc,v 1.4 2006/06/29 19:08:54 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UIcommand.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcommand.cc,v 1.25 2006/06/29 19:08:56 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/src/G4UIcommandTree.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcommandTree.cc,v 1.14 2008/01/30 11:20:03 lgarnier Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/src/G4UIcontrolMessenger.cc

@@ -26 +26 @@
 //
 // $Id: G4UIcontrolMessenger.cc,v 1.11 2007/06/06 15:14:51 asaim Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/src/G4UIdirectory.cc

@@ -26 +26 @@
 //
 // $Id: G4UIdirectory.cc,v 1.4 2006/06/29 19:09:02 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/intercoms/src/G4UImanager.cc

@@ -26 +26 @@
 //
 // $Id: G4UImanager.cc,v 1.33 2007/07/16 10:14:36 kmura Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/src/G4UImessenger.cc

@@ -26 +26 @@
 //
 // $Id: G4UImessenger.cc,v 1.7 2006/06/29 19:09:06 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/src/G4UIparameter.cc

@@ -26 +26 @@
 //
 // $Id: G4UIparameter.cc,v 1.14 2006/06/29 19:09:09 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 

trunk/source/intercoms/src/G4UIsession.cc

@@ -26 +26 @@
 //
 // $Id: G4UIsession.cc,v 1.7 2006/06/29 19:09:11 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/src/G4UnitsMessenger.cc

@@ -26 +26 @@
 //
 // $Id: G4UnitsMessenger.cc,v 1.7 2006/06/29 19:09:13 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

trunk/source/intercoms/src/G4VGlobalFastSimulationManager.cc

@@ -26 +26 @@
 //
 // $Id: G4VGlobalFastSimulationManager.cc,v 1.5 2006/06/29 19:09:15 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //