1.0.2 get faster lexer

git-svn-id: http://json-simple.googlecode.com/svn/trunk@73 b68fe964-5755-0410-a06c-9fee2ea08261

Author: fangyidong

AUTHORS.txt

@@ -1 +1 @@
-Fang Yidong <fangyidong@yahoo.com.cn>
+Fang Yidong <fangyidong@gmail.com>

ChangeLog.txt

@@ -1,5 +1,9 @@
 ChangeLog
 
+Version 1.02 (2009/01/10)
+* Updated json.lex to improve performance of the lexer
+* Removed Rope.java and related junit test
+
 Version 1.01 (2008/08/26)
 * License changed to a more commerce friendly and clear one, Apache License 2.0
 * Use JFlex to generate a faster Yylex.java

VERSION.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

build.xml

@@ -1,5 +1,5 @@
 <project name="json-simple" default="main" basedir=".">
-	<property name="current-version" value="1.0.1"/>
+	<property name="current-version" value="1.0.2"/>
 	<property name="jar-name" value="json_simple-${current-version}.jar"/>
 
 	<target name="main" depends="mkdir,compile,jar">
@@ -29,4 +29,4 @@
 				basedir="build/main"
 				includes="**/*.class"/>
 	</target>
-</project>
+</project>

doc/json.lex

@@ -1,11 +1,9 @@
 package org.json.simple.parser;
 
-import org.json.simple.rope.Rope;
-
 %%
 
 %{
-private Rope sb=new Rope();
+private StringBuffer sb=new StringBuffer();
 
 %}
 
@@ -17,8 +15,11 @@ HEX_D = [a-fA-F0-9]
 INT = [-]?[0-9]+
 DOUBLE = {INT}((\.[0-9]+)?([eE][-+]?[0-9]+)?)
 WS = [ \t\r\n]
+UNESCAPED_CH = [^\"\\]
 %%
 
+<STRING_BEGIN> \"	 			{ yybegin(YYINITIAL);return new Yytoken(Yytoken.TYPE_VALUE,sb.toString());}
+<STRING_BEGIN> {UNESCAPED_CH}+	{ sb.append(yytext());}
 <STRING_BEGIN> \\\" 			{sb.append('"');}
 <STRING_BEGIN> \\\\				{sb.append('\\');}
 <STRING_BEGIN> \\\/				{sb.append('/');}
@@ -30,10 +31,8 @@ WS = [ \t\r\n]
 <STRING_BEGIN> \\u{HEX_D}{HEX_D}{HEX_D}{HEX_D}	{	int ch=Integer.parseInt(yytext().substring(2),16);
 													sb.append((char)ch);
 												}
-
-<STRING_BEGIN> \"	 			{ yybegin(YYINITIAL);return new Yytoken(Yytoken.TYPE_VALUE,sb.toString());}
-<STRING_BEGIN> .	 			{ sb.append(yytext());}
-<YYINITIAL> \" 					{ sb.clear();yybegin(STRING_BEGIN);}
+												
+<YYINITIAL> \" 					{ sb.delete(0, sb.length());yybegin(STRING_BEGIN);}
 <YYINITIAL> {INT}				{ Long val=Long.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE,val);}
 <YYINITIAL> {DOUBLE}			{ Double val=Double.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE,val);}
 <YYINITIAL> "true"|"false"		{ Boolean val=Boolean.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE,val);}
@@ -44,4 +43,4 @@ WS = [ \t\r\n]
 <YYINITIAL> "]"					{ return new Yytoken(Yytoken.TYPE_RIGHT_SQUARE,null);}
 <YYINITIAL> ","					{ return new Yytoken(Yytoken.TYPE_COMMA,null);}
 <YYINITIAL> ":"					{ return new Yytoken(Yytoken.TYPE_COLON,null);}
-<YYINITIAL> {WS}		    {}
+<YYINITIAL> {WS}+		    	{}

lib/json_simple-1.0.2.jar

@@ -22,20 +22,30 @@ public class JSONParser {
 	public static final int S_PASSED_PAIR_KEY=4;
 	public static final int S_IN_ERROR=-1;
 
+	private LinkedList statusStack = new LinkedList();
+	private LinkedList valueStack = new LinkedList();
+	private Yylex lexer = new Yylex((Reader)null);
+	private Yytoken token = null;
+	private int status = S_INIT;
+	
 	private int peekStatus(LinkedList statusStack){
 		if(statusStack.size()==0)
 			return -1;
 		Integer status=(Integer)statusStack.getFirst();
 		return status.intValue();
 	}
 
+	private void reset(Reader in) throws Exception{
+		statusStack.clear();
+		valueStack.clear();
+		lexer.yyreset(in);
+		token = null;
+		status = S_INIT;
+	}
+	
 	public Object parse(Reader in) throws Exception{
-		LinkedList statusStack=new LinkedList();
-		LinkedList valueStack=new LinkedList();
-		Yylex lexer=new Yylex(in);
-		Yytoken token=null;
-		int status=S_INIT;
-		
+		reset(in);
+			
 		try{
 			do{
 				token=lexer.yylex();

src/org/json/simple/parser/JSONParser.java

@@ -43,7 +43,6 @@
 			<formatter type="plain"/>
 			<test name="org.json.simple.Test"/>
 			<test name="org.json.simple.parser.YylexTest"/>
-			<test name="org.json.simple.rope.RopeTest"/>
 		</junit>
 	</target>
-</project>
+</project>

src/org/json/simple/parser/Yylex.java

@@ -4,6 +4,8 @@
  */
 package org.json.simple;
 
+import java.util.List;
+
 import junit.framework.TestCase;
 
 
@@ -39,6 +41,11 @@ public void testDecode() throws Exception{
 		s="[5,,2]";
 		obj=JSONValue.parse(s);
 		assertEquals("[5,2]",obj.toString());
+		
+		s="[\"hello\\bworld\\\"abc\\tdef\\\\ghi\\rjkl\\n123\\u4e2d\"]";
+		obj=JSONValue.parse(s);
+		assertEquals("hello\bworld\"abc\tdef\\ghi\rjkl\n123中",((List)obj).get(0).toString());
+		
 	}
 
 	public void testEncode() throws Exception{