Skip to content

Commit

Permalink
update grammar for latest jison
Browse files Browse the repository at this point in the history
  • Loading branch information
@zaach
zaach committed May 27, 2012
1 parent 4f24c33 commit eca60bb
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 48 deletions.
74 changes: 49 additions & 25 deletions lib/jsonlint.js
View file
Expand Up @@ -9,7 +9,7 @@ performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {

var $0 = $$.length - 1;
switch (yystate) {
case 1:this.$ = yytext;
case 1:this.$ = yytext.replace(/\\\\/g, "\\");
break;
case 2:this.$ = Number(yytext);
break;
Expand Down Expand Up @@ -86,7 +86,7 @@ parse: function parse(input) {
token = self.symbols_[token] || token;
}
return token;
};
}

var symbol, preErrorSymbol, state, action, a, r, yyval={},p,len,newState, expected;
while (true) {
Expand All @@ -104,6 +104,7 @@ parse: function parse(input) {
}

// handle parse error
_handle_error:
if (typeof action === 'undefined' || !action.length || !action[0]) {

if (!recovering) {
Expand All @@ -114,7 +115,7 @@ parse: function parse(input) {
}
var errStr = '';
if (this.lexer.showPosition) {
errStr = 'Parse error on line '+(yylineno+1)+":\n"+this.lexer.showPosition()+'\nExpecting '+expected.join(', ');
errStr = 'Parse error on line '+(yylineno+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+expected.join(', ') + ", got '" + this.terminals_[symbol]+ "'";
} else {
errStr = 'Parse error on line '+(yylineno+1)+": Unexpected " +
(symbol == 1 /*EOF*/ ? "end of input" :
Expand Down Expand Up @@ -228,8 +229,10 @@ parse: function parse(input) {
}

return true;
}};/* Jison generated lexer */
var lexer = (function(){var lexer = ({EOF:1,
}};
/* Jison generated lexer */
var lexer = (function(){
var lexer = ({EOF:1,
parseError:function parseError(str, hash) {
if (this.yy.parseError) {
this.yy.parseError(str, hash);
Expand Down Expand Up @@ -265,6 +268,9 @@ more:function () {
this._more = true;
return this;
},
less:function (n) {
this._input = this.match.slice(n) + this._input;
},
pastInput:function () {
var past = this.matched.substr(0, this.matched.length - this.match.length);
return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
Expand All @@ -289,6 +295,8 @@ next:function () {

var token,
match,
tempMatch,
index,
col,
lines;
if (!this._more) {
Expand All @@ -297,26 +305,31 @@ next:function () {
}
var rules = this._currentRules();
for (var i=0;i < rules.length; i++) {
match = this._input.match(this.rules[rules[i]]);
if (match) {
lines = match[0].match(/\n.*/g);
if (lines) this.yylineno += lines.length;
this.yylloc = {first_line: this.yylloc.last_line,
last_line: this.yylineno+1,
first_column: this.yylloc.last_column,
last_column: lines ? lines[lines.length-1].length-1 : this.yylloc.last_column + match[0].length}
this.yytext += match[0];
this.match += match[0];
this.matches = match;
this.yyleng = this.yytext.length;
this._more = false;
this._input = this._input.slice(match[0].length);
this.matched += match[0];
token = this.performAction.call(this, this.yy, this, rules[i],this.conditionStack[this.conditionStack.length-1]);
if (token) return token;
else return;
tempMatch = this._input.match(this.rules[rules[i]]);
if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
match = tempMatch;
index = i;
if (!this.options.flex) break;
}
}
if (match) {
lines = match[0].match(/\n.*/g);
if (lines) this.yylineno += lines.length;
this.yylloc = {first_line: this.yylloc.last_line,
last_line: this.yylineno+1,
first_column: this.yylloc.last_column,
last_column: lines ? lines[lines.length-1].length-1 : this.yylloc.last_column + match[0].length}
this.yytext += match[0];
this.match += match[0];
this.yyleng = this.yytext.length;
this._more = false;
this._input = this._input.slice(match[0].length);
this.matched += match[0];
token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
if (this.done && this._input) this.done = false;
if (token) return token;
else return;
}
if (this._input === "") {
return this.EOF;
} else {
Expand All @@ -340,7 +353,14 @@ popState:function popState() {
},
_currentRules:function _currentRules() {
return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
},
topState:function () {
return this.conditionStack[this.conditionStack.length-2];
},
pushState:function begin(condition) {
this.begin(condition);
}});
lexer.options = {};
lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {

var YYSTATE=YY_START
Expand Down Expand Up @@ -375,8 +395,12 @@ case 13:return 'INVALID'
break;
}
};
lexer.rules = [/^\s+/,/^-?([0-9]|[1-9][0-9]+)(\.[0-9]+)?([eE][-+]?[0-9]+)?\b/,/^"(\\["bfnrt/\\]|\\u[a-fA-F0-9]{4}|[^\0-\x09\x0a-\x1f"\\])*"/,/^\{/,/^\}/,/^\[/,/^\]/,/^,/,/^:/,/^true\b/,/^false\b/,/^null\b/,/^$/,/^./];
lexer.conditions = {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13],"inclusive":true}};return lexer;})()
lexer.rules = [/^(?:\s+)/,/^(?:(-?([0-9]|[1-9][0-9]+))(\.[0-9]+)?([eE][-+]?[0-9]+)?\b)/,/^(?:"(?:\\[\\"bfnrt/]|\\u[a-fA-F0-9]{4}|[^\\\0-\x09\x0a-\x1f"])*")/,/^(?:\{)/,/^(?:\})/,/^(?:\[)/,/^(?:\])/,/^(?:,)/,/^(?::)/,/^(?:true\b)/,/^(?:false\b)/,/^(?:null\b)/,/^(?:$)/,/^(?:.)/];
lexer.conditions = {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13],"inclusive":true}};


;
return lexer;})()
parser.lexer = lexer;
return parser;
})();
Expand Down
35 changes: 18 additions & 17 deletions src/jsonlint.l
View file
@@ -1,23 +1,24 @@
esc "\\"
int "-"?([0-9]|[1-9][0-9]+)
exp ([eE][-+]?[0-9]+)
frac ("."[0-9]+)
exp [eE][-+]?[0-9]+
frac "."[0-9]+

%%
\s+ {/* skip whitespace */}
{int}{frac}?{exp}?\b {return 'NUMBER';}
'"'("\\"["bfnrt/{esc}]|"\\u"[a-fA-F0-9]{4}|[^\0-\x09\x0a-\x1f"{esc}])*'"' {yytext = yytext.substr(1,yyleng-2); return 'STRING';}
"{" %{ return '{' %}
"}" %{ return '}' %}
"[" {return '['}
"]" {return ']'}
"," {return ','}
":" {return ':'}
"true" {return 'TRUE'}
"false" {return 'FALSE'}
"null" {return 'NULL'}
<<EOF>> {return 'EOF'}
. {return 'INVALID'}
\s+ /* skip whitespace */

{int}{frac}?{exp}?\b return 'NUMBER'
\"(?:'\\'[\\"bfnrt/]|'\\u'[a-fA-F0-9]{4}|[^\\\0-\x09\x0a-\x1f"])*\" yytext = yytext.substr(1,yyleng-2); return 'STRING'

"{" return '{'
"}" return ''
"[" return '['
"]" return ']'
"," return ','
":" return ':'
"true" return 'TRUE'
"false" return 'FALSE'
"null" return 'NULL'
<<EOF>> return 'EOF'
. return 'INVALID'
%%
7 changes: 2 additions & 5 deletions src/jsonlint.y
View file
@@ -1,13 +1,10 @@
%start JSONText

/*
ECMA-262 5th Edition, 15.12.1 The JSON Grammar.
*/


/* author: Zach Carter */


%start JSONText

%%

JSONString
Expand Down

0 comments on commit eca60bb

Please sign in to comment.