Merge pull request #19 from stackgl/builtin-decl

Builtin declaration

Author: dy

lib/expr.js

@@ -85,7 +85,7 @@ prefix('(', function() {
   this.type = 'group'
   this.children = [expression(0)]
   advance(')')
-  return this 
+  return this
 })
 prefix('++')
 prefix('--')
@@ -142,7 +142,7 @@ function symbol(id, binding_power) {
     }
   } else {
     sym = Object.create(original_symbol)
-    sym.id = id 
+    sym.id = id
     sym.lbp = binding_power
     symbol_table[id] = sym
   }

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)
     }
 

package.json

@@ -4,7 +4,7 @@
   "description": "transform streamed glsl tokens into an ast",
   "main": "stream.js",
   "dependencies": {
-    "glsl-tokenizer": "^2.0.0",
+    "glsl-tokenizer": "^2.1.4",
     "through": "2.3.4",
     "through2": "^0.6.3"
   },

test/fixture.glsl

@@ -50,7 +50,7 @@ int emptyname(vec2[4]);
 int emptynameemptyname(vec2, vec2);
 
 
-int first, second, third, fourth, fifth, sixth, seventh, eigth;
+uint first, second, third, fourth, fifth, sixth, seventh, eigth;
 
     void main(){
         vTexcoord = texcoord;

test/index.js

@@ -53,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'