Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge github crap fix

  • Loading branch information...
commit d26f40913f0131b443d76b99d454edefc1e9b180 2 parents 91f34a5 + 43c2d2e
Peter van der Zee authored
Showing with 9 additions and 5 deletions.
  1. +5 −2 README
  2. +3 −2 ZeParser.js
  3. +1 −1  package.json
7 README
View
@@ -3,7 +3,11 @@ http://github.com/qfox/ZeParser
(c) Peter van der Zee
http://qfox.nl
-Tokenizer is used by the parser. The parser tells the tokenizer whether the next token may be a regular expression or not. Without the parser, the tokenizer will fail if regular expression literals are used in the input.
+
+Benchmark
+http://qfox.github.com/ZeParser/benchmark.html
+
+The Tokenizer is used by the parser. The parser tells the tokenizer whether the next token may be a regular expression or not. Without the parser, the tokenizer will fail if regular expression literals are used in the input.
Usage:
ZeParser.parse(input);
@@ -31,4 +35,3 @@ var tree = []; // this should probably be refactored away some day
var tokenizer = new Tokenizer(input); // dito
var parser = new ZeParser(input, tokenizer, tree);
parser.parse(); // returns tree..., should never throw errors
-
5 ZeParser.js
View
@@ -1,5 +1,5 @@
if (typeof exports !== 'undefined') {
- var Tokenizer = require('./tokenizer').Tokenizer;
+ var Tokenizer = require('./Tokenizer').Tokenizer;
exports.ZeParser = ZeParser;
}
@@ -1642,12 +1642,13 @@ ZeParser.prototype = {
match = this.tokenizer.storeCurrentAndFetchNextToken(false, match, stack);
if (match.value != '}') match = this.eatStatements(match, stack);
if (match.value != '}') match = this.failsafe('MissingTryBlockCurlyClose', match);
- match = this.tokenizer.storeCurrentAndFetchNextToken(false, match, stack);
if (this.ast) { //#ifdef FULL_AST
match.twin = lhc;
lhc.twin = match;
} //#endif
+
+ match = this.tokenizer.storeCurrentAndFetchNextToken(false, match, stack);
return match;
},
2  package.json
View
@@ -2,7 +2,7 @@
"author": "Peter van der Zee (http://qfox.nl/)",
"name": "zeparser",
"description": "My JavaScript parser",
- "version": "0.0.1",
+ "version": "0.0.3",
"homepage": "https://github.com/qfox/ZeParser/",
"repository": {
"type": "git",
Please sign in to comment.
Something went wrong with that request. Please try again.