Make tests for builtin declaration

Author: dy

lib/index.js

@@ -504,7 +504,7 @@ function parser() {
   function parse_decllist() {
     // grab ident
 
-    if(token.type === 'ident') {
+    if(token.type === 'ident' || token.type === 'builtin') {
       var name = token.data
       state.unshift(ident())
       state.scope.define(name)
@@ -560,7 +560,7 @@ function parser() {
   }
 
   function parse_ident() {
-    if(token.type !== 'ident') {
+    if(token.type !== 'ident' && token.type !== 'builtin') {
       return unexpected('expected user-defined name, got '+token.data)
     }
 

test/index.js

@@ -10,7 +10,7 @@ var ParseArray  = require('../direct')
 var expectSelectors = require('./selectors-expected.json')
 var fixture = path.join(__dirname, 'fixture.glsl')
 
-test.only('selector stream', function(t) {
+test('selector stream', function(t) {
   var selectors = []
 
   fs.createReadStream(fixture)
@@ -20,13 +20,6 @@ test.only('selector stream', function(t) {
       selectors.push(selector(x))
     })
     .once('end', function() {
-      // console.log(selectors.length, expectSelectors.length)
-      // for (let i = 0; i < selectors.length; i++) {
-      //   if (selectors[i].length !== expectSelectors[i].length) {
-      //     console.log(i, selectors[i], expectSelectors[i])
-      //     break
-      //   }
-      // }
       t.deepEqual(selectors, expectSelectors)
       t.end()
     })
@@ -60,7 +53,7 @@ test('stream().program === array()', function(t) {
 
       var actual = Object.keys(ast.scope).sort()
       var expect = [
-          'a', 'b', 'c', 'eigth', 'empty', 'emptyname'
+          'a', 'b', 'c', 'distance', 'eigth', 'empty', 'emptyname'
         , 'emptynameemptyname', 'fifth', 'first', 'forwarddecl'
         , 'fourth', 'gary', 'main', 'one', 'position', 'proj'
         , 'second', 'seventh', 'sixth', 'texcoord', 'third', 'two'

test/selectors-expected.json

@@ -543,12 +543,11 @@
   [ "stmtlist", "stmt", "decl", "placeholder" ],
   [ "stmtlist", "stmt", "decl", "placeholder" ],
   [ "stmtlist", "stmt", "decl", "keyword" ],
+  [ "stmtlist", "stmt", "decl", "decllist", "ident" ],
+  [ "stmtlist", "stmt", "decl", "decllist", "expr", "literal" ],
+  [ "stmtlist", "stmt", "decl", "decllist", "expr" ],
   [ "stmtlist", "stmt", "decl", "decllist" ],
   [ "stmtlist", "stmt", "decl" ],
-  [ "stmtlist", "stmt", "expr", "assign", "builtin" ],
-  [ "stmtlist", "stmt", "expr", "assign", "literal" ],
-  [ "stmtlist", "stmt", "expr", "assign" ],
-  [ "stmtlist", "stmt", "expr" ],
   [ "stmtlist", "stmt" ],
   [ "stmtlist", "stmt", "decl", "placeholder" ],
   [ "stmtlist", "stmt", "decl", "placeholder" ],