ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/mdParser/MDParser.cpp
(Generate patch)

Comparing trunk/src/mdParser/MDParser.cpp (file contents):
Revision 1901 by gezelter, Wed Aug 22 02:28:28 2012 UTC vs.
Revision 1902 by gezelter, Tue Jul 16 17:16:45 2013 UTC

# Line 1 | Line 1
1 < /* $ANTLR 2.7.7 (20120725): "MDParser.g" -> "MDParser.cpp"$ */
1 > /* $ANTLR 2.7.7 (20121118): "MDParser.g" -> "MDParser.cpp"$ */
2   #include "MDParser.hpp"
3   #include <antlr/NoViableAltException.hpp>
4   #include <antlr/SemanticException.hpp>
# Line 188 | Line 188 | void MDParser::componentblock() {
188                  tmp6_AST = astFactory->create(LT(1));
189                  astFactory->addASTChild(currentAST, tmp6_AST);
190                  match(RCURLY);
191 < #line 74 "MDParser.g"
191 > #line 75 "MDParser.g"
192                  tmp6_AST->setType(ENDBLOCK);
193   #line 194 "MDParser.cpp"
194                  componentblock_AST = currentAST.root;
# Line 228 | Line 228 | void MDParser::moleculeblock() {
228                  tmp9_AST = astFactory->create(LT(1));
229                  astFactory->addASTChild(currentAST, tmp9_AST);
230                  match(RCURLY);
231 < #line 92 "MDParser.g"
231 > #line 93 "MDParser.g"
232                  tmp9_AST->setType(ENDBLOCK);
233   #line 234 "MDParser.cpp"
234                  moleculeblock_AST = currentAST.root;
# Line 268 | Line 268 | void MDParser::zconstraintblock() {
268                  tmp12_AST = astFactory->create(LT(1));
269                  astFactory->addASTChild(currentAST, tmp12_AST);
270                  match(RCURLY);
271 < #line 77 "MDParser.g"
271 > #line 78 "MDParser.g"
272                  tmp12_AST->setType(ENDBLOCK);
273   #line 274 "MDParser.cpp"
274                  zconstraintblock_AST = currentAST.root;
# Line 308 | Line 308 | void MDParser::restraintblock() {
308                  tmp15_AST = astFactory->create(LT(1));
309                  astFactory->addASTChild(currentAST, tmp15_AST);
310                  match(RCURLY);
311 < #line 80 "MDParser.g"
311 > #line 81 "MDParser.g"
312                  tmp15_AST->setType(ENDBLOCK);
313   #line 314 "MDParser.cpp"
314                  restraintblock_AST = currentAST.root;
# Line 348 | Line 348 | void MDParser::flucqblock() {
348                  tmp18_AST = astFactory->create(LT(1));
349                  astFactory->addASTChild(currentAST, tmp18_AST);
350                  match(RCURLY);
351 < #line 83 "MDParser.g"
351 > #line 84 "MDParser.g"
352                  tmp18_AST->setType(ENDBLOCK);
353   #line 354 "MDParser.cpp"
354                  flucqblock_AST = currentAST.root;
# Line 388 | Line 388 | void MDParser::rnemdblock() {
388                  tmp21_AST = astFactory->create(LT(1));
389                  astFactory->addASTChild(currentAST, tmp21_AST);
390                  match(RCURLY);
391 < #line 86 "MDParser.g"
391 > #line 87 "MDParser.g"
392                  tmp21_AST->setType(ENDBLOCK);
393   #line 394 "MDParser.cpp"
394                  rnemdblock_AST = currentAST.root;
# Line 428 | Line 428 | void MDParser::minimizerblock() {
428                  tmp24_AST = astFactory->create(LT(1));
429                  astFactory->addASTChild(currentAST, tmp24_AST);
430                  match(RCURLY);
431 < #line 89 "MDParser.g"
431 > #line 90 "MDParser.g"
432                  tmp24_AST->setType(ENDBLOCK);
433   #line 434 "MDParser.cpp"
434                  minimizerblock_AST = currentAST.root;
# Line 729 | Line 729 | void MDParser::atomblock() {
729                  tmp39_AST = astFactory->create(LT(1));
730                  astFactory->addASTChild(currentAST, tmp39_AST);
731                  match(RCURLY);
732 < #line 106 "MDParser.g"
732 > #line 107 "MDParser.g"
733                  tmp39_AST->setType(ENDBLOCK);
734   #line 735 "MDParser.cpp"
735                  atomblock_AST = currentAST.root;
# Line 788 | Line 788 | void MDParser::bondblock() {
788                  tmp44_AST = astFactory->create(LT(1));
789                  astFactory->addASTChild(currentAST, tmp44_AST);
790                  match(RCURLY);
791 < #line 115 "MDParser.g"
791 > #line 116 "MDParser.g"
792                  tmp44_AST->setType(ENDBLOCK);
793   #line 794 "MDParser.cpp"
794                  bondblock_AST = currentAST.root;
# Line 847 | Line 847 | void MDParser::bendblock() {
847                  tmp49_AST = astFactory->create(LT(1));
848                  astFactory->addASTChild(currentAST, tmp49_AST);
849                  match(RCURLY);
850 < #line 122 "MDParser.g"
850 > #line 123 "MDParser.g"
851                  tmp49_AST->setType(ENDBLOCK);
852   #line 853 "MDParser.cpp"
853                  bendblock_AST = currentAST.root;
# Line 906 | Line 906 | void MDParser::torsionblock() {
906                  tmp54_AST = astFactory->create(LT(1));
907                  astFactory->addASTChild(currentAST, tmp54_AST);
908                  match(RCURLY);
909 < #line 129 "MDParser.g"
909 > #line 130 "MDParser.g"
910                  tmp54_AST->setType(ENDBLOCK);
911   #line 912 "MDParser.cpp"
912                  torsionblock_AST = currentAST.root;
# Line 950 | Line 950 | void MDParser::inversionblock() {
950                  match(LCURLY);
951                  { // ( ... )*
952                  for (;;) {
953 <                        if ((LA(1) == CENTER || LA(1) == ID)) {
953 >                        if ((_tokenSet_10.member(LA(1)))) {
954                                  inversionstatement();
955                                  astFactory->addASTChild( currentAST, returnAST );
956                          }
# Line 965 | Line 965 | void MDParser::inversionblock() {
965                  tmp59_AST = astFactory->create(LT(1));
966                  astFactory->addASTChild(currentAST, tmp59_AST);
967                  match(RCURLY);
968 < #line 136 "MDParser.g"
968 > #line 137 "MDParser.g"
969                  tmp59_AST->setType(ENDBLOCK);
970   #line 971 "MDParser.cpp"
971                  inversionblock_AST = currentAST.root;
# Line 1009 | Line 1009 | void MDParser::rigidbodyblock() {
1009                  tmp64_AST = astFactory->create(LT(1));
1010                  astFactory->addASTChild(currentAST, tmp64_AST);
1011                  match(RCURLY);
1012 < #line 143 "MDParser.g"
1012 > #line 145 "MDParser.g"
1013                  tmp64_AST->setType(ENDBLOCK);
1014   #line 1015 "MDParser.cpp"
1015                  rigidbodyblock_AST = currentAST.root;
# Line 1068 | Line 1068 | void MDParser::cutoffgroupblock() {
1068                  tmp69_AST = astFactory->create(LT(1));
1069                  astFactory->addASTChild(currentAST, tmp69_AST);
1070                  match(RCURLY);
1071 < #line 150 "MDParser.g"
1071 > #line 152 "MDParser.g"
1072                  tmp69_AST->setType(ENDBLOCK);
1073   #line 1074 "MDParser.cpp"
1074                  cutoffgroupblock_AST = currentAST.root;
# Line 1112 | Line 1112 | void MDParser::fragmentblock() {
1112                  tmp74_AST = astFactory->create(LT(1));
1113                  astFactory->addASTChild(currentAST, tmp74_AST);
1114                  match(RCURLY);
1115 < #line 157 "MDParser.g"
1115 > #line 159 "MDParser.g"
1116                  tmp74_AST->setType(ENDBLOCK);
1117   #line 1118 "MDParser.cpp"
1118                  fragmentblock_AST = currentAST.root;
# Line 1174 | Line 1174 | void MDParser::atomstatement() {
1174          }
1175          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1176                  reportError(ex);
1177 <                recover(ex,_tokenSet_10);
1177 >                recover(ex,_tokenSet_11);
1178          }
1179          returnAST = atomstatement_AST;
1180   }
# Line 1205 | Line 1205 | void MDParser::doubleNumberTuple() {
1205          }
1206          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1207                  reportError(ex);
1208 <                recover(ex,_tokenSet_11);
1208 >                recover(ex,_tokenSet_12);
1209          }
1210          returnAST = doubleNumberTuple_AST;
1211   }
# Line 1246 | Line 1246 | void MDParser::bondstatement() {
1246          }
1247          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1248                  reportError(ex);
1249 <                recover(ex,_tokenSet_12);
1249 >                recover(ex,_tokenSet_13);
1250          }
1251          returnAST = bondstatement_AST;
1252   }
# Line 1277 | Line 1277 | void MDParser::inttuple() {
1277          }
1278          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1279                  reportError(ex);
1280 <                recover(ex,_tokenSet_11);
1280 >                recover(ex,_tokenSet_12);
1281          }
1282          returnAST = inttuple_AST;
1283   }
# Line 1318 | Line 1318 | void MDParser::bendstatement() {
1318          }
1319          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1320                  reportError(ex);
1321 <                recover(ex,_tokenSet_12);
1321 >                recover(ex,_tokenSet_13);
1322          }
1323          returnAST = bendstatement_AST;
1324   }
# Line 1359 | Line 1359 | void MDParser::torsionstatement() {
1359          }
1360          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1361                  reportError(ex);
1362 <                recover(ex,_tokenSet_12);
1362 >                recover(ex,_tokenSet_13);
1363          }
1364          returnAST = torsionstatement_AST;
1365   }
# Line 1386 | Line 1386 | void MDParser::inversionstatement() {
1386                          match(CENTER);
1387                          match(LPAREN);
1388                          intConst();
1389 +                        astFactory->addASTChild( currentAST, returnAST );
1390 +                        match(RPAREN);
1391 +                        match(SEMICOLON);
1392 +                        inversionstatement_AST = currentAST.root;
1393 +                        break;
1394 +                }
1395 +                case SATELLITES:
1396 +                {
1397 +                        ANTLR_USE_NAMESPACE(antlr)RefAST tmp101_AST = ANTLR_USE_NAMESPACE(antlr)nullAST;
1398 +                        tmp101_AST = astFactory->create(LT(1));
1399 +                        astFactory->makeASTRoot(currentAST, tmp101_AST);
1400 +                        match(SATELLITES);
1401 +                        match(LPAREN);
1402 +                        inttuple();
1403                          astFactory->addASTChild( currentAST, returnAST );
1404                          match(RPAREN);
1405                          match(SEMICOLON);
# Line 1400 | Line 1414 | void MDParser::inversionstatement() {
1414          }
1415          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1416                  reportError(ex);
1417 <                recover(ex,_tokenSet_13);
1417 >                recover(ex,_tokenSet_14);
1418          }
1419          returnAST = inversionstatement_AST;
1420   }
# Line 1421 | Line 1435 | void MDParser::rigidbodystatement() {
1435                  }
1436                  case MEMBERS:
1437                  {
1438 <                        ANTLR_USE_NAMESPACE(antlr)RefAST tmp101_AST = ANTLR_USE_NAMESPACE(antlr)nullAST;
1439 <                        tmp101_AST = astFactory->create(LT(1));
1440 <                        astFactory->makeASTRoot(currentAST, tmp101_AST);
1438 >                        ANTLR_USE_NAMESPACE(antlr)RefAST tmp105_AST = ANTLR_USE_NAMESPACE(antlr)nullAST;
1439 >                        tmp105_AST = astFactory->create(LT(1));
1440 >                        astFactory->makeASTRoot(currentAST, tmp105_AST);
1441                          match(MEMBERS);
1442                          match(LPAREN);
1443                          inttuple();
# Line 1441 | Line 1455 | void MDParser::rigidbodystatement() {
1455          }
1456          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1457                  reportError(ex);
1458 <                recover(ex,_tokenSet_12);
1458 >                recover(ex,_tokenSet_13);
1459          }
1460          returnAST = rigidbodystatement_AST;
1461   }
# Line 1462 | Line 1476 | void MDParser::cutoffgroupstatement() {
1476                  }
1477                  case MEMBERS:
1478                  {
1479 <                        ANTLR_USE_NAMESPACE(antlr)RefAST tmp105_AST = ANTLR_USE_NAMESPACE(antlr)nullAST;
1480 <                        tmp105_AST = astFactory->create(LT(1));
1481 <                        astFactory->makeASTRoot(currentAST, tmp105_AST);
1479 >                        ANTLR_USE_NAMESPACE(antlr)RefAST tmp109_AST = ANTLR_USE_NAMESPACE(antlr)nullAST;
1480 >                        tmp109_AST = astFactory->create(LT(1));
1481 >                        astFactory->makeASTRoot(currentAST, tmp109_AST);
1482                          match(MEMBERS);
1483                          match(LPAREN);
1484                          inttuple();
# Line 1482 | Line 1496 | void MDParser::cutoffgroupstatement() {
1496          }
1497          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1498                  reportError(ex);
1499 <                recover(ex,_tokenSet_12);
1499 >                recover(ex,_tokenSet_13);
1500          }
1501          returnAST = cutoffgroupstatement_AST;
1502   }
# Line 1499 | Line 1513 | void MDParser::fragmentstatement() {
1513          }
1514          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1515                  reportError(ex);
1516 <                recover(ex,_tokenSet_14);
1516 >                recover(ex,_tokenSet_15);
1517          }
1518          returnAST = fragmentstatement_AST;
1519   }
# Line 1536 | Line 1550 | void MDParser::doubleNumber() {
1550          }
1551          catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
1552                  reportError(ex);
1553 <                recover(ex,_tokenSet_15);
1553 >                recover(ex,_tokenSet_16);
1554          }
1555          returnAST = doubleNumber_AST;
1556   }
1557  
1558   void MDParser::initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory )
1559   {
1560 <        factory.setMaxNodeType(56);
1560 >        factory.setMaxNodeType(57);
1561   }
1562   const char* MDParser::tokenNames[] = {
1563          "<0>",
# Line 1564 | Line 1578 | const char* MDParser::tokenNames[] = {
1578          "\"fragment\"",
1579          "\"members\"",
1580          "\"center\"",
1581 +        "\"satellites\"",
1582          "\"position\"",
1583          "\"orientation\"",
1584          "\"flucQ\"",
# Line 1606 | Line 1621 | const char* MDParser::tokenNames[] = {
1621          0
1622   };
1623  
1624 < const unsigned long MDParser::_tokenSet_0_data_[] = { 24117488UL, 0UL, 0UL, 0UL };
1624 > const unsigned long MDParser::_tokenSet_0_data_[] = { 48234736UL, 0UL, 0UL, 0UL };
1625   // "component" "molecule" "zconstraint" "restraint" "flucQ" "RNEMD" "minimizer"
1626   // ID
1627   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_0(_tokenSet_0_data_,4);
1628   const unsigned long MDParser::_tokenSet_1_data_[] = { 2UL, 0UL, 0UL, 0UL };
1629   // EOF
1630   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_1(_tokenSet_1_data_,4);
1631 < const unsigned long MDParser::_tokenSet_2_data_[] = { 24117490UL, 0UL, 0UL, 0UL };
1631 > const unsigned long MDParser::_tokenSet_2_data_[] = { 48234738UL, 0UL, 0UL, 0UL };
1632   // EOF "component" "molecule" "zconstraint" "restraint" "flucQ" "RNEMD"
1633   // "minimizer" ID
1634   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_2(_tokenSet_2_data_,4);
1635 < const unsigned long MDParser::_tokenSet_3_data_[] = { 562036722UL, 0UL, 0UL, 0UL };
1635 > const unsigned long MDParser::_tokenSet_3_data_[] = { 1124073458UL, 0UL, 0UL, 0UL };
1636   // EOF "component" "molecule" "zconstraint" "restraint" "atom" "bond" "bend"
1637   // "torsion" "inversion" "rigidBody" "cutoffGroup" "fragment" "members"
1638 < // "center" "position" "orientation" "flucQ" "RNEMD" "minimizer" ID RCURLY
1638 > // "center" "satellites" "position" "orientation" "flucQ" "RNEMD" "minimizer"
1639 > // ID RCURLY
1640   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_3(_tokenSet_3_data_,4);
1641 < const unsigned long MDParser::_tokenSet_4_data_[] = { 16842496UL, 0UL, 0UL, 0UL };
1641 > const unsigned long MDParser::_tokenSet_4_data_[] = { 33619712UL, 0UL, 0UL, 0UL };
1642   // "atom" "bond" "bend" "torsion" "inversion" "rigidBody" "cutoffGroup"
1643   // "fragment" ID
1644   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_4(_tokenSet_4_data_,4);
1645 < const unsigned long MDParser::_tokenSet_5_data_[] = { 67108864UL, 0UL, 0UL, 0UL };
1645 > const unsigned long MDParser::_tokenSet_5_data_[] = { 134217728UL, 0UL, 0UL, 0UL };
1646   // SEMICOLON
1647   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_5(_tokenSet_5_data_,4);
1648 < const unsigned long MDParser::_tokenSet_6_data_[] = { 2214592512UL, 6UL, 0UL, 0UL };
1648 > const unsigned long MDParser::_tokenSet_6_data_[] = { 134217728UL, 13UL, 0UL, 0UL };
1649   // SEMICOLON RBRACKET RPAREN COMMA
1650   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_6(_tokenSet_6_data_,4);
1651 < const unsigned long MDParser::_tokenSet_7_data_[] = { 67108864UL, 6UL, 0UL, 0UL };
1651 > const unsigned long MDParser::_tokenSet_7_data_[] = { 134217728UL, 12UL, 0UL, 0UL };
1652   // SEMICOLON RPAREN COMMA
1653   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_7(_tokenSet_7_data_,4);
1654 < const unsigned long MDParser::_tokenSet_8_data_[] = { 553713408UL, 0UL, 0UL, 0UL };
1654 > const unsigned long MDParser::_tokenSet_8_data_[] = { 1107361536UL, 0UL, 0UL, 0UL };
1655   // "atom" "bond" "bend" "torsion" "inversion" "rigidBody" "cutoffGroup"
1656   // "fragment" ID RCURLY
1657   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_8(_tokenSet_8_data_,4);
1658 < const unsigned long MDParser::_tokenSet_9_data_[] = { 17563648UL, 0UL, 0UL, 0UL };
1658 > const unsigned long MDParser::_tokenSet_9_data_[] = { 35127296UL, 0UL, 0UL, 0UL };
1659   // "position" "orientation" ID
1660   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_9(_tokenSet_9_data_,4);
1661 < const unsigned long MDParser::_tokenSet_10_data_[] = { 554434560UL, 0UL, 0UL, 0UL };
1662 < // "position" "orientation" ID RCURLY
1661 > const unsigned long MDParser::_tokenSet_10_data_[] = { 33947648UL, 0UL, 0UL, 0UL };
1662 > // "center" "satellites" ID
1663   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_10(_tokenSet_10_data_,4);
1664 < const unsigned long MDParser::_tokenSet_11_data_[] = { 0UL, 2UL, 0UL, 0UL };
1665 < // RPAREN
1664 > const unsigned long MDParser::_tokenSet_11_data_[] = { 1108869120UL, 0UL, 0UL, 0UL };
1665 > // "position" "orientation" ID RCURLY
1666   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_11(_tokenSet_11_data_,4);
1667 < const unsigned long MDParser::_tokenSet_12_data_[] = { 553713664UL, 0UL, 0UL, 0UL };
1668 < // "members" ID RCURLY
1667 > const unsigned long MDParser::_tokenSet_12_data_[] = { 0UL, 4UL, 0UL, 0UL };
1668 > // RPAREN
1669   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_12(_tokenSet_12_data_,4);
1670 < const unsigned long MDParser::_tokenSet_13_data_[] = { 553779200UL, 0UL, 0UL, 0UL };
1671 < // "center" ID RCURLY
1670 > const unsigned long MDParser::_tokenSet_13_data_[] = { 1107361792UL, 0UL, 0UL, 0UL };
1671 > // "members" ID RCURLY
1672   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_13(_tokenSet_13_data_,4);
1673 < const unsigned long MDParser::_tokenSet_14_data_[] = { 553648128UL, 0UL, 0UL, 0UL };
1674 < // ID RCURLY
1673 > const unsigned long MDParser::_tokenSet_14_data_[] = { 1107689472UL, 0UL, 0UL, 0UL };
1674 > // "center" "satellites" ID RCURLY
1675   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_14(_tokenSet_14_data_,4);
1676 < const unsigned long MDParser::_tokenSet_15_data_[] = { 0UL, 6UL, 0UL, 0UL };
1677 < // RPAREN COMMA
1676 > const unsigned long MDParser::_tokenSet_15_data_[] = { 1107296256UL, 0UL, 0UL, 0UL };
1677 > // ID RCURLY
1678   const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_15(_tokenSet_15_data_,4);
1679 + const unsigned long MDParser::_tokenSet_16_data_[] = { 0UL, 12UL, 0UL, 0UL };
1680 + // RPAREN COMMA
1681 + const ANTLR_USE_NAMESPACE(antlr)BitSet MDParser::_tokenSet_16(_tokenSet_16_data_,4);
1682  
1683  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines