bump version

Author: chrisdickinson

README.md

@@ -63,11 +63,15 @@ legal & caveats
 known bugs
 ----------
 
-* because i am not smart enough to write a fully streaming parser, the current parser "cheats" a bit when it encounters a `expr` node! it actually waits until it has all the tokens it needs to build a tree for a given expression, then builds it and emits it as a single node. the `expr` parsing is heavily influenced by [crockford's tdop article](http://javascript.crockford.com/tdop/tdop.html). the rest of the parser is heavily influenced by fever dreams.
+* because i am not smart enough to write a fully streaming parser, the current parser "cheats" a bit when it encounters a `expr` node! it actually waits until it has all the tokens it needs to build a tree for a given expression, then builds it and emits the constituent child nodes in the expected order. the `expr` parsing is heavily influenced by [crockford's tdop article](http://javascript.crockford.com/tdop/tdop.html). the rest of the parser is heavily influenced by fever dreams.
 
 * the parser might hit a state where it's looking at what *could be* an expression, or it could be a declaration --
 that is, the statement starts with a previously declared `struct`. it'll opt to pretend it's a declaration, but that
-might not be the case (it might just a user error!)
+might not be the case -- it might be a user-defined constructor starting a statement!
+
+* "unhygenic" `#if` / `#endif` macros are completely unhandled at the moment, since they're a bit of a pain.
+if you've got unhygenic macros in your code, move the #if / #endifs to statement level, and have them surround
+wholly parseable code. this sucks, and i am sorry.
 
 license
 -------

package.json

@@ -1,6 +1,6 @@
 {
   "name": "glsl-parser",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "transform streamed glsl tokens into an ast",
   "main": "index.js",
   "dependencies": {

test/test.glsl

@@ -13,38 +13,52 @@ precision highp vec4;
 struct xxx {
   int y;
   float b;
-}
+} a = 2, b;
 
+struct {
+  xxx z;
+} www;
+struct gary {
+  vec4 busey;
+};
 varying vec2 vTexcoord;
 varying vec3 vPosition;
 uniform mat4 proj, view;
 
     attribute vec3 position;
     attribute vec2 texcoord;
 
-int x(void) {
+int forwarddecl(vec2 c);
+
+int forwarddecl(vec2 c) {
 
 }
 
-int y() {
+int empty() {
 
 }
 
-int z(int a, int b) {
+int two(int a, int b) {
 
 }
 
-int w(int a) {
+int one(int a[2]) {
   do x; while(1);
 }
 
+int emptyname(vec2[4]);
+int emptynameemptyname(vec2, vec2);
+
+
 int first, second, third, fourth, fifth, sixth, seventh, eigth;
 
     void main(){
         vTexcoord = texcoord;
         vPosition = position;
         vec3 thing = vec2(1., 2.);
         int v_thing, garybusey;
+        thing.rgba = 2e10 + .2e2 + 1.e3 * 0xFaBc09 + (3 * v_thing);
+
         for(xxx i = 0; i < 10; ++i) {
           discard;
         }
@@ -54,7 +68,7 @@ int first, second, third, fourth, fifth, sixth, seventh, eigth;
         gl_Position = proj * view * // nope
         vec4(position, 1.0);
 
-        if(first < /*hello*/ y) { z; }
+        if(first <  y) { z; }
         if(second < y) z;
         if(third == y) z; else if(z == w) y;
         if(fourth == y) z; else if(z == w) { y; };
@@ -70,3 +84,4 @@ int first, second, third, fourth, fifth, sixth, seventh, eigth;
         break;
         continue;
     }
+