Ignore:
Timestamp:
Apr 22, 2009, 12:38:42 PM (17 years ago)
Author:
garnier
Message:

update

Location:
trunk/source/intercoms/src
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/intercoms/src/G4UIaliasList.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIaliasList.cc,v 1.6 2006/06/29 19:08:33 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030

  • trunk/source/intercoms/src/G4UIbatch.cc

    r850 r1016  
    2424// ********************************************************************
    2525//
    26 // $Id: G4UIbatch.cc,v 1.16 2007/08/10 09:46:10 kmura Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4UIbatch.cc,v 1.17 2008/11/21 10:54:16 kmura Exp $
     27// GEANT4 tag $Name: geant4-09-02 $
    2828//
    2929// ====================================================================
    … …  
    4545 
    4646  while (pos != G4String::npos || pos0 != G4String::npos) {
     47    if (str[pos0] == '\"') {
     48      pos = str.find_first_of("\"", pos0+1);
     49      if(pos != G4String::npos) pos++;
     50    }
     51    if (str[pos0] == '\'') {
     52      pos = str.find_first_of("\'", pos0+1);
     53      if(pos != G4String::npos) pos++;
     54    }
     55
    4756    tokens.push_back(str.substr(pos0, pos-pos0));
    48 
    4957    pos0 = str.find_first_not_of(delimiter, pos);
    5058    pos = str.find_first_of(delimiter, pos0);
    … …  
    110118    if(!qcontinued && cmdline.size()==0) continue;
    111119
     120    // '#' is treated as echoing something
     121    if(cmdline[(size_t)0]=='#') return cmdline;
     122
    112123    // tokenize...
    113124    std::vector<G4String> tokens;
    … …  
    115126    qcontinued= false;
    116127    for (G4int i=0; i< G4int(tokens.size()); i++) {
     128      // string after '#" is ignored
     129      if(tokens[i][(size_t)0] == '#' ) break;
    117130      // '\' or '_' is treated as continued line.
    118131      if(tokens[i] == '\\' || tokens[i] == '_' ) {
    … …  
    129142    }
    130143
    131     if(qcontinued) continue; // read` the next line
     144    if(qcontinued) continue; // read the next line
    132145
    133146    if(cmdtotal.size() != 0) break;
    … …  
    137150  // strip again
    138151  cmdtotal= cmdtotal.strip(G4String::both);
    139 
    140   // '#' is treated as echoing something
    141   if(cmdtotal[(size_t)0]=='#') return cmdtotal;
    142 
    143   // normally something after # is treated just as comment and ignored
    144   str_size ic= cmdtotal.find_first_of('#');
    145   if(ic != G4String::npos) {
    146     cmdtotal= cmdtotal(0, ic);
    147   }
    148152
    149153  // finally,
    … …  
    153157
    154158  return cmdtotal;
    155 
    156159}
    157160

  • trunk/source/intercoms/src/G4UIcmdWith3Vector.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWith3Vector.cc,v 1.8 2006/06/29 19:08:38 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.9 2006/06/29 19:08:41 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWithABool.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWithABool.cc,v 1.8 2006/06/29 19:08:43 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWithADouble.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWithADouble.cc,v 1.8 2006/06/29 19:08:45 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.9 2006/06/29 19:08:48 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWithAString.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWithAString.cc,v 1.6 2006/06/29 19:08:50 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWithAnInteger.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWithAnInteger.cc,v 1.8 2006/06/29 19:08:52 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcmdWithoutParameter.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcmdWithoutParameter.cc,v 1.4 2006/06/29 19:08:54 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcommand.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcommand.cc,v 1.25 2006/06/29 19:08:56 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UIcommandTree.cc

    r842 r1016  
    2626//
    2727// $Id: G4UIcommandTree.cc,v 1.14 2008/01/30 11:20:03 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030

  • trunk/source/intercoms/src/G4UIcontrolMessenger.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIcontrolMessenger.cc,v 1.11 2007/06/06 15:14:51 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030

  • trunk/source/intercoms/src/G4UIdirectory.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIdirectory.cc,v 1.4 2006/06/29 19:09:02 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UImanager.cc

    r850 r1016  
    2626//
    2727// $Id: G4UImanager.cc,v 1.33 2007/07/16 10:14:36 kmura Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UImessenger.cc

    r850 r1016  
    2626//
    2727// $Id: G4UImessenger.cc,v 1.7 2006/06/29 19:09:06 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030

  • trunk/source/intercoms/src/G4UIparameter.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIparameter.cc,v 1.14 2006/06/29 19:09:09 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030

  • trunk/source/intercoms/src/G4UIsession.cc

    r850 r1016  
    2626//
    2727// $Id: G4UIsession.cc,v 1.7 2006/06/29 19:09:11 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4UnitsMessenger.cc

    r850 r1016  
    2626//
    2727// $Id: G4UnitsMessenger.cc,v 1.7 2006/06/29 19:09:13 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//

  • trunk/source/intercoms/src/G4VGlobalFastSimulationManager.cc

    r850 r1016  
    2626//
    2727// $Id: G4VGlobalFastSimulationManager.cc,v 1.5 2006/06/29 19:09:15 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02 $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.