use external lib for streams

formal-language · Dec 25, 2017 · 2e6f073 · 2e6f073
1 parent 364e55d
commit 2e6f073
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 94 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,19 @@
 Grammar compilation toolkit for JavaScript.
 See [docs](https://aureooms.github.io/js-grammar/index.html).
 
+```js
+	import * as stream from '@aureooms/js-stream' ;
+	import { ll1 } from '@aureooms/js-grammar' ;
+
+	const G = [ [ [ '0' , '1' ] ] ] ;
+
+	const table = ll1.compile(0, G);
+
+	const tokens = stream.fromstring('010101');
+
+	const tree = ll1.parse(0, G, table, tokens);
+```
+
 [![License](https://img.shields.io/github/license/aureooms/js-grammar.svg?style=flat)](https://raw.githubusercontent.com/aureooms/js-grammar/master/LICENSE)
 [![NPM version](https://img.shields.io/npm/v/@aureooms/js-grammar.svg?style=flat)](https://www.npmjs.org/package/@aureooms/js-grammar)
 [![Build status](https://img.shields.io/travis/aureooms/js-grammar.svg?style=flat)](https://travis-ci.org/aureooms/js-grammar)

diff --git a/lib/ll1/StreamFromIterable.js b/lib/ll1/StreamFromIterable.js
diff --git a/lib/ll1/_parse.js b/lib/ll1/_parse.js
diff --git a/lib/ll1/index.js b/lib/ll1/index.js
diff --git a/lib/ll1/parse.js b/lib/ll1/parse.js
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
   },
   "devDependencies": {
     "@aureooms/js-compare": "^1.4.5",
+    "@aureooms/js-stream": "^0.0.1",
     "ava": "^0.24.0",
     "babel-cli": "^6.26.0",
     "babel-polyfill": "^6.26.0",

diff --git a/src/ll1/StreamFromIterable.js b/src/ll1/StreamFromIterable.js
diff --git a/src/ll1/_parse.js b/src/ll1/_parse.js
@@ -1,3 +1,5 @@
+import EOF from './EOF' ;
+
 /**
  * Table-driven predictive parsing.
  *
@@ -6,13 +8,15 @@
  * @param stream
  * @returns {Array}
  */
-export default function _parse ( grammar , table , rule , stream , nonterminal , production ) {
+export default function _parse ( grammar , table , rule , stream , nonterminal , productionid ) {
 
 	const children = [];
 
 	for (const x of rule) {
 
-		const t = stream.read();
+		const lookahead = stream.read();
+
+		const t = lookahead === stream.eof ? EOF : lookahead ;
 
 		if (typeof x === 'string') {
 			if (t === x) { children.push(x); continue; }
@@ -32,7 +36,7 @@ export default function _parse ( grammar , table , rule , stream , nonterminal ,
 	return {
 		nonterminal ,
 		'production' : {
-			'id' : production ,
+			'id' : productionid ,
 			rule ,
 		} ,
 		children

diff --git a/src/ll1/index.js b/src/ll1/index.js
@@ -1,6 +1,5 @@
 import EOF from './EOF' ;
 import EW from './EW' ;
-import StreamFromIterable from './StreamFromIterable' ;
 import _compile from './_compile' ;
 import _first from './_first' ;
 import _parse from './_parse' ;
@@ -14,7 +13,6 @@ import parse from './parse' ;
 export default {
 	EOF ,
 	EW ,
-	StreamFromIterable ,
 	_compile ,
 	_first ,
 	_parse ,
@@ -29,7 +27,6 @@ export default {
 export {
 	EOF ,
 	EW ,
-	StreamFromIterable ,
 	_compile ,
 	_first ,
 	_parse ,