Rename evals

Author: dy

lib/operators.js

@@ -298,6 +298,7 @@ function processOperation (left, right, operator) {
 
 		//float ∀ float case
 		if (floatRE.test(left) && floatRE.test(right)) {
+			// FIXME: replace with subscript
 			opResult = eval(`${left} ${operator} ${right}`);
 		}
 

package-lock.json

@@ -10,7 +10,8 @@
     "glsl-tokenizer": "^2.1.5",
     "inherits": "^2.0.1",
     "pick-by-alias": "^1.2.0",
-    "prepr": "^1.1.2"
+    "prepr": "^1.2.5",
+    "subscript": "^7.3.1"
   },
   "devDependencies": {
     "almost-equal": "^1.1.0",

package.json

@@ -121,7 +121,7 @@ fs.createReadStream('./source.glsl')
 
 ## Related
 
-* [nogl-shader-output](https://github.com/dy/nogl-shader-output) — eval fragment shader on rectangular vertex input, gl-less.<br/>
+* [nogl-shader-output](https://github.com/dy/nogl-shader-output) — evaluatefragment shader on rectangular vertex input, gl-less.<br/>
 * [glsl-parser](http://stack.gl/packages/#stackgl/glsl-parser) — build glsl AST.<br/>
 * [glsl-tokenizer](http://stack.gl/packages/#stackgl/glsl-tokenizer) — detect glsl tokens.<br/>
 * [glsl.js](https://npmjs.org/package/glsl) — an alternative glsl to asm.js compiler by [@devongovett](https://github.com/devongovett), built with [jison](https://npmjs.org/package/jison) instead of glsl-parser. Project is abandoned :(.<br/>

readme.md

@@ -2,7 +2,7 @@ var test = require('tape')
 var GLSL = require('../')
 var compile = GLSL.compile
 var test = require('tape')
-var eval = require('./util/eval')
+var evaluate= require('./util/eval')
 var clean = require('cln')
 
 
@@ -64,7 +64,7 @@ test('Override', function (t) {
 	t.end()
 })
 test('Arguments matching', function (t) {
-	t.deepEqual(eval(`
+	t.deepEqual(evaluate(`
 		float f (float x) {
 			return 1.0;
 		}
@@ -231,7 +231,7 @@ test('Calling function with output arguments', function (t) {
 		gl_Position = [x, y, z, 1];
 	`))
 
-	t.deepEqual(eval(source, {debug: false}), [1.1, 1, 2, 1]);
+	t.deepEqual(evaluate(source, {debug: false}), [1.1, 1, 2, 1]);
 	t.end()
 })
 
@@ -271,6 +271,6 @@ test('Calling nested functions with output arguments', function (t) {
 		gl_Position = [x, y, 0, 1];
 	`))
 
-	t.deepEqual(eval(source, {debug: false}), [2.1, 1, 0, 1]);
+	t.deepEqual(evaluate(source, {debug: false}), [2.1, 1, 0, 1]);
 	t.end()
 })

test/functions.js

@@ -1,7 +1,7 @@
 var GLSL = require('../')
 var compile = GLSL.compile
 var test = require('tape')
-var eval = require('./util/eval')
+var evaluate= require('./util/eval')
 var clean = require('cln')
 var glsl = require('glslify')
 
@@ -22,7 +22,7 @@ test('vec2 c() {return vec2();}; void a() {vec4 b = vec4(c(), 0, 0);}', function
 	t.end()
 })
 test('vec3 x; x += 1;', function (t) {
-	t.deepEqual(eval(t.name, {debug: false}), [1, 1, 1]);
+	t.deepEqual(evaluate(t.name, {debug: false}), [1, 1, 1]);
 	t.end()
 })
 test('console.log(123);', function (t) {
@@ -54,15 +54,15 @@ test('float x; vec2 uv, position = fn(x) * vec2(uv.yx.yx.x, -uv.y);', function (
 	t.end()
 })
 test('vec2 uv = vec2(1.); uv += mix(uv, uv, 0.);', function (t) {
-	t.deepEqual(eval(t.name), [2, 2]);
+	t.deepEqual(evaluate(t.name), [2, 2]);
 	t.end()
 })
 test('vec2 uv = vec2(0., 0.5); uv *= smoothstep(0., 1., uv);', function (t) {
-	t.deepEqual(eval(t.name), [0, 0.25]);
+	t.deepEqual(evaluate(t.name), [0, 0.25]);
 	t.end()
 })
 test('float x = 0.5; vec2 uv = vec2(0., 0.5); uv *= smoothstep(0., 1., x);', function (t) {
-	t.deepEqual(eval(t.name), [0, 0.25]);
+	t.deepEqual(evaluate(t.name), [0, 0.25]);
 	t.end()
 })
 test('vec2 position; position *= 1.0 + vec2();', function (t) {
@@ -172,7 +172,7 @@ test('vec4 v = vec4(1, 2, 3, 4); v.wy *= v.zx;', function (t) {
 	//	return idx == null ? gl_position[i] : this[idx];
 	//}, gl_Position.wy * gl_Position.zx)
 	t.deepEqual(
-		eval(t.name),
+		evaluate(t.name),
 		[1, 2, 3, 12]
 	);
 	t.end()
@@ -206,7 +206,7 @@ test('vec2 p; gl_Position = vec4(p.yx / 2.0, 0, 1);', function (t) {
 	t.end()
 })
 test('int f(float x) {return 1;}; int f(double x) {return 2;}; double x; f(x);', function (t) {
-	t.equal(eval(t.name, {debug:false}), 2);
+	t.equal(evaluate(t.name, {debug:false}), 2);
 	t.end()
 })
 test('main, then again main', function (t) {
@@ -347,7 +347,7 @@ test('texture2D', function (t) {
 	data.width = 2;
 	data.height = 2;
 
-	t.deepEqual(eval(`
+	t.deepEqual(evaluate(`
 		uniform sampler2D t;
 		texture2D(t, vec2(0.2, 0.8));
 	`, {
@@ -530,7 +530,7 @@ test('vec3 f() { return vec3(3.); } vec3 x = -f();', function (t) {
 		var x = f().map(function (_) {return -_;});
 	`)
 	console.log()
-	t.deepEqual(eval(t.name + ';x;'), [-3,-3,-3])
+	t.deepEqual(evaluate(t.name + ';x;'), [-3,-3,-3])
 
 	t.end()
 })