You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/02/15 23:23:16 UTC
svn commit: r910353 -
/ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj
Author: doogie
Date: Mon Feb 15 22:23:15 2010
New Revision: 910353
URL: http://svn.apache.org/viewvc?rev=910353&view=rev
Log:
Fix errors and warnings with the JSON grammar.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj?rev=910353&r1=910352&r2=910353&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj Mon Feb 15 22:23:15 2010
@@ -151,7 +151,7 @@
<WHITESPACE: [" ", "\r", "\n", "\t"]>
}
-<*>
+<DEFAULT,RESOLVE>
MORE:
{
<COMMENT_START: "/*"> { if (curLexState != IN_COMMENT) pushState(IN_COMMENT); }
@@ -266,7 +266,6 @@
}
{
<OBJECT_BEGIN>
- (<ITEM_SEP>)*
(JSONObjectEntry(map))? (<ITEM_SEP> (JSONObjectEntry(map))?)*
<OBJECT_END>
{ return map; }