[ViewVC] Diff of: OpenMD/trunk/src/mdParser/MDTreeParser.g

Comparing trunk/src/mdParser/MDTreeParser.g (file contents):
Revision 1979 by gezelter, Sat Apr 5 20:56:01 2014 UTC vs.
Revision 2026 by gezelter, Wed Oct 22 12:23:59 2014 UTC

#	Line 51 \| Line 51 \| constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
51		{
52		int ival;
53		RealType dval, x, y, z;
54	<	Vector3d dvec;
54	>	std::vector<RealType> dvec;
55		}
56		: ival=intConst {blockStack.top()->assign(id->getText(), ival);}
57		\| dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
58	–	\| #(LPAREN x=doubleNumber COMMA y=doubleNumber COMMA z=doubleNumber RPAREN)
59	–	{ dvec.x() = x;
60	–	dvec.y() = y;
61	–	dvec.z() = z;
62	–	blockStack.top()->assign(id->getText(), dvec);
63	–	}
58		\| str1:ID {blockStack.top()->assign(id->getText(), str1->getText());}
59		\| str2:StringLiteral {std::string s = str2->getText();
60		s = s.substr(1, s.length()-2);
61		blockStack.top()->assign(id->getText(),s);
62		}
63	+	\| #(LPAREN dvec=doubleNumberTuple RPAREN)
64	+	{
65	+	blockStack.top()->assign(id->getText(), dvec);
66	+	}
67		;
68
69

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