X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=redfsm%2Fxmlscan.rl;h=23dcaca2020d48dc489c27682728e8c18fcb57b7;hb=b7bbc4afa85019ccddd4a8ecb297619a12930500;hp=08356999a051d8ecce11e492688058fbaa44ebd2;hpb=3f821f1f45be7f0d131455cb671cef64e9f81d08;p=external%2Fragel.git

diff --git a/redfsm/xmlscan.rl b/redfsm/xmlscan.rl
index 0835699..23dcaca 100644
--- a/redfsm/xmlscan.rl
+++ b/redfsm/xmlscan.rl
@@ -22,15 +22,12 @@
 #include <string.h>
 #include "vector.h"
 #include "xmlparse.h"
-#include "buffer.h"
 
 using std::istream;
 using std::cout;
 using std::cerr;
 using std::endl;
 
-#define BUFSIZE 4096
-
 %%{
 	machine XmlScanner;
 	write data;
@@ -45,50 +42,21 @@ public:
 	static struct XMLTagHashPair *in_word_set (const char *str, unsigned int len);
 };
 
-struct XmlScanner
+XmlScanner::XmlScanner( const char *fileName, istream &input ) : 
+	fileName(fileName),
+	input(input), 
+	curline(1), 
+	curcol(1),
+	p(0), pe(0), 
+	done(false),
+	data(0), data_len(0),
+	value(0)
 {
-	XmlScanner( const char *fileName, istream &input ) : 
-		fileName(fileName),
-		input(input), 
-		curline(1), 
-		curcol(1),
-		p(0), pe(0), 
-		done(false),
-		data(0), data_len(0),
-		value(0)
-	{
-		%%{
-			machine XmlScanner;
-			write init;
-		}%%
-	}
-	
-	int scan();
-	void adjustAttrPointers( int distance );
-	std::ostream &error();
-
-	const char *fileName;
-	istream &input;
-
-	/* Scanner State. */
-	int cs, act, have, curline, curcol;
-	char *ts, *te;
-	char *p, *pe;
-	int done;
-
-	/* Token data */
-	char *data;
-	int data_len;
-	int value;
-	AttrMkList attrMkList;
-	Buffer buffer;
-	char *tag_id_start;
-	int tag_id_len;
-	int token_col, token_line;
-
-	char buf[BUFSIZE];
-};
-
+	%%{
+		machine XmlScanner;
+		write init;
+	}%%
+}
 
 #define TK_NO_TOKEN (-1)
 #define TK_ERR 1
@@ -211,7 +179,7 @@ int XmlScanner::scan( )
 			}
 
 			p = buf + have;
-			space = BUFSIZE - have;
+			space = XML_BUFSIZE - have;
 
 			if ( space == 0 ) {
 				/* We filled up the buffer trying to scan a token. */