Create classes for syntax nodes, variables, assignment

src/assignment.ts

@@ -0,0 +1,21 @@
+import SyntaxNode from './syntaxnode';
+import Variable from './variable';
+import Reference from './reference';
+
+export default class Assignment implements SyntaxNode {
+    private lhs: Reference;
+    private rhs: SyntaxNode;
+
+    constructor(lhs: Reference, rhs: SyntaxNode) {
+        this.lhs = lhs;
+        this.rhs = rhs;
+    }
+
+    public dependencies(): Set<Variable> {
+        return this.rhs.dependencies();
+    }
+
+    public source(): string {
+        return `${this.lhs.source()} = ${this.rhs.source()};`;
+    }
+}

src/index.ts → src/calder.ts

@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-import { Variable } from './variable';
-
-export namespace Calder {
-    export class Variable { }
-}
+export * from './variable';
+export * from './function';
+export * from './reference';
+export * from './shader';
+export * from './qualifier';

src/function.ts

@@ -0,0 +1,27 @@
+import Variable from './variable';
+import SyntaxNode from './syntaxnode';
+
+export default class Function implements SyntaxNode {
+    public readonly name: string;
+    private statements: SyntaxNode[];
+
+    constructor(name: string, statements: SyntaxNode[] = []) {
+        this.name = name;
+        this.statements = statements;
+    }
+
+    public dependencies(): Set<Variable> {
+        return this.statements.reduce(
+            (union, statement) => new Set([...union, ...statement.dependencies()]),
+            new Set());
+    }
+
+    public source(): string {
+        // TODO: allow more than void()
+        return `void ${this.name}() {\n` +
+            this.statements
+                .map(statement => statement.source())
+                .join('\n') +
+            '\n}';
+    }
+}

src/qualifier.ts

@@ -0,0 +1,11 @@
+enum Qualifier {
+    Attribute = 'attribute',
+    Uniform = 'uniform',
+    Varying = 'varying',
+    Const = 'const',
+    In = 'in',
+    Out = 'out',
+    InOut = 'inout'
+}
+
+export default Qualifier;

src/reference.ts

@@ -0,0 +1,18 @@
+import Variable from './variable';
+import SyntaxNode from './syntaxnode';
+
+export default class Reference implements SyntaxNode {
+    private variable: Variable;
+
+    constructor(variable: Variable) {
+        this.variable = variable;
+    }
+
+    public dependencies(): Set<Variable> {
+        return new Set([this.variable]);
+    }
+
+    public source(): string {
+        return this.variable.name;
+    }
+}

src/shader.ts

@@ -0,0 +1,20 @@
+import Variable from './variable';
+import Function from './function';
+
+export default class Shader {
+    public main: Function;
+
+    constructor(main: Function = new Function('main')) {
+        this.main = main;
+    } 
+
+    public source(): string {
+        return `${this.header()}\n${this.main.source()}`;
+    }
+
+    private header(): string {
+        return [...this.main.dependencies()]
+            .map(dependency => dependency.declaration())
+            .join('\n');
+    }
+}

src/syntaxnode.ts

@@ -0,0 +1,6 @@
+import Variable from './variable';
+
+export default interface SyntaxNode {
+    dependencies(): Set<Variable>;
+    source(): string;
+}

src/variable.ts

@@ -1,27 +1,18 @@
-/**
- * Calder - A WebGL library for writing WebGL shaders
- *
- * Copyright (c) 2017 Paul Bardea, Abhishek Madan, Andrew McBurney, Dave Pagurek
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+import Qualifier from './qualifier';
 
-export class Variable {
+export default class Variable {
+    public readonly name: string;
+    public readonly qualifier: Qualifier;
+    public readonly kind: string;
 
+    // TODO: typecheck kind
+    constructor(qualifier: Qualifier, kind: string, name: string) {
+        this.kind = kind;
+        this.qualifier = qualifier;
+        this.name = name;
+    }
+
+    public declaration(): string {
+        return `${this.qualifier} ${this.kind} ${this.name};`;
+    }
 }

test/shader.spec.ts

@@ -0,0 +1,28 @@
+import { expect } from 'chai';
+import * as cgl from './calder';
+
+describe('Shader', () => {
+    describe('source', () => {
+        it('generates the expected source code', () => {
+            const glPosition = new cgl.Variable(cgl.Qualifier.Out, 'vec4', 'gl_Position');
+            const vertexPosition = new cgl.Variable(cgl.Qualifier.Attribute, 'vec4', 'vertexPosition');
+            const shader = new cgl.Shader(new cgl.Function('main', [
+                new cgl.Assignment(
+                    new cgl.Reference(glPosition),
+                    new cgl.Reference(vertexPosition))]));
+
+            const source = shader.source();
+
+            // TODO: recognize gl_Position as a default that doesn't need declaring
+            const expected = `
+                attribute vec4 vertexPosition;
+                out vec4 gl_Position;
+
+                void main() {
+                    gl_Position = aVertexPosition;
+                }`;
+
+            expect(source).to.equalIgnoreSpaces(expected);
+        });
+    })
+});

tsconfig.json

@@ -4,7 +4,9 @@
     "module": "es6",
     "moduleResolution": "node",
     "experimentalDecorators": true,
-    "noImplicitAny": true
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "lib": ["es5", "es6", "dom"]
   },
   "exclude": ["node_modules"]
 }