You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2013/04/22 18:34:49 UTC
git commit: MRQL-5: JSON parser has a null scanner
Updated Branches:
refs/heads/master 9d395fb6f -> f4257e9cb
MRQL-5: JSON parser has a null scanner
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/f4257e9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/f4257e9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/f4257e9c
Branch: refs/heads/master
Commit: f4257e9cb04f8d83454c899d00a74c86982b69f9
Parents: 9d395fb
Author: fegaras <fe...@cse.uta.edu>
Authored: Mon Apr 22 11:34:25 2013 -0500
Committer: fegaras <fe...@cse.uta.edu>
Committed: Mon Apr 22 11:34:25 2013 -0500
----------------------------------------------------------------------
src/JsonParser.java | 4 +---
src/JsonSplitter.java | 2 ++
src/Main.java | 1 +
src/TopLevel.gen | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/f4257e9c/src/JsonParser.java
----------------------------------------------------------------------
diff --git a/src/JsonParser.java b/src/JsonParser.java
index ec76817..ba2b14a 100644
--- a/src/JsonParser.java
+++ b/src/JsonParser.java
@@ -78,10 +78,8 @@ public class JsonParser implements Parser {
public Bag parse ( String s ) {
try {
- JSONParser parser = new JSONParser();
JSONLex scanner = new JSONLex(new StringReader(s));
- MRQLLex.reset();
- parser.setScanner(scanner);
+ JSONParser parser = new JSONParser(scanner);
parser.parse();
return new Bag(parser.top_level);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/f4257e9c/src/JsonSplitter.java
----------------------------------------------------------------------
diff --git a/src/JsonSplitter.java b/src/JsonSplitter.java
index 36442ad..d7978a5 100644
--- a/src/JsonSplitter.java
+++ b/src/JsonSplitter.java
@@ -83,6 +83,8 @@ final public class JsonSplitter implements Iterator<DataOutputBuffer> {
public void remove () { }
boolean is_start_tag ( String tagname ) {
+ if (tags == null)
+ return true;
for (String tag: tags)
if (tag.contentEquals(tagname))
return true;
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/f4257e9c/src/Main.java
----------------------------------------------------------------------
diff --git a/src/Main.java b/src/Main.java
index 2a04754..b264ac9 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -57,6 +57,7 @@ final public class Main extends Configured implements Tool {
public int run ( String args[] ) throws Exception {
Config.parse_args(args,conf);
Evaluator.init(conf);
+ new TopLevel();
System.out.print("Apache MRQL version "+version+" (");
if (Config.compile_functional_arguments)
System.out.print("compiled ");
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/f4257e9c/src/TopLevel.gen
----------------------------------------------------------------------
diff --git a/src/TopLevel.gen b/src/TopLevel.gen
index 0a6a15f..711ac34 100644
--- a/src/TopLevel.gen
+++ b/src/TopLevel.gen
@@ -24,7 +24,7 @@ import java.io.PrintStream;
/** Provides the API for compilation/code-generation */
final public class TopLevel extends Interpreter {
- static {
+ public TopLevel () {
// XML and JSON are user-defined types:
datadef("XML",#<union(Node(tuple(string,bag(tuple(string,string)),list(XML))),
CData(string))>);