archive-gh-me/gpu.js
1
0
Fork 0
mirror of https://github.com/gpujs/gpu.js.git synced 2026-01-25 16:08:02 +00:00
Code Issues Projects Releases Wiki Activity

Fixed more shit

Browse Source
This commit is contained in:
Matthew Saw 2016-01-24 04:19:53 +08:00
parent 11674adb60
commit 7efce6f110
3 changed files with 353 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
src/grammar.jison
View File

@ -115,6 +115,124 @@ StringLiteral (\"{DoubleStringCharacter}*\")|(\'{SingleStringCharacter}*\')
%start Program /* Define Start Production */
%% /* Define Grammar Productions */
Statement
: Block
| VariableStatement
| ExpressionStatement
| ForStatement
| IfStatement
| BreakStatement
| ContinueStatement
| ReturnStatement
;
Block
: "{" StatementList "}"
{
$$ = new BlockStatementNode($2);
}
;
StatementList
: StatementList Statement
{
$$ = $1.concat($2);
}
|
{
$$ = [];
}
;
VariableStatement
: "VAR" Variable ";"
{
$$ = new VariableDeclaratorNode($2, null);
}
| "VAR" AssignmentExpression ";"
{
$$ = new VariableDeclaratorNode($2.left, $2.right);
}
;
ExpressionStatement
: Expression ";"
{
$$ = new ExpressionStatementNode($1);
}
;
ContinueStatement
: "CONTINUE" ";"
{
$$ = new ContinueStatementNode();
}
;
BreakStatement
: "BREAK" ";"
{
$$ = new BreakStatementNode();
}
;
ReturnStatement
: "RETURN" ";"
{
$$ = new ReturnStatementNode(null);
}
| "RETURN" Expression ";"
{
$$ = new ReturnStatementNode($2);
}
;
ForStatement
: "FOR" "(" Expression ";" Expression ";" Expression ")" Statement
{
$$ = new ForStatementNode($3, $5, $7, $9);
}
| "FOR" "(" Expression ";" Expression ";" ")" Statement
{
$$ = new ForStatementNode($3, $5, null, $8);
}
| "FOR" "(" Expression ";" ";" Expression ")" Statement
{
$$ = new ForStatementNode($3, null, $6, $8);
}
| "FOR" "(" Expression ";" ";" ")" Statement
{
$$ = new ForStatementNode($3, null, null, $7);
}
| "FOR" "(" ";" Expression ";" Expression ")" Statement
{
$$ = new ForStatementNode(null, $4, $6, $8);
}
| "FOR" "(" ";" Expression ";" ")" Statement
{
$$ = new ForStatementNode(null, $4, null, $7);
}
| "FOR" "(" ";" ";" Expression ")" Statement
{
$$ = new ForStatementNode(null, null, $5, $7);
}
| "FOR" "(" ";" ";" ")" Statement
{
$$ = new ForStatementNode(null, null, null, $6);
}
;
IfStatement
: "IF" "(" Expression ")" Statement
{
$$ = new IfStatementNode($3, $5, null);
}
| "IF" "(" Expression ")" Statement "ELSE" Statement
{
$$ = new IfStatementNode($3, $5, $7);
}
;
Expression
: Variable
| AssignmentExpression
@ -170,6 +288,10 @@ AssignmentExpression
{
$$ = new AssignmentExpressionNode("=", $1, $3);
}
| Variable "=" FunctionExpression
{
$$ = new AssignmentExpressionNode("=", $1, $3);
}
| Variable AssignmentOperator MathExpression
{
$$ = new AssignmentExpressionNode($2, $1, $3);
@ -242,7 +364,7 @@ MathExpression
;
PostfixMathExpression
: NumberLiteral
: NumericLiteral
| Variable "++"
{
$$ = new UpdateExpressionNode("++", $1, false);
@ -371,117 +493,6 @@ UnaryBoolExpr
| BooleanLiteral
;
Statement
: Block
| VariableStatement
| ExpressionStatement
| ForStatement
| IfStatement
| BreakStatement
| ContinueStatement
| ReturnStatement
;
Block
: "{" StatementList "}"
{
$$ = new BlockStatementNode($2);
}
;
StatementList
: StatementList Statement
{
$$ = $1.concat($2);
}
|
{
$$ = [];
}
;
VariableStatement
: "VAR" Variable ";"
{
$$ = new VariableDeclaratorNode($2, null);
}
| "VAR" AssignmentExpression ";"
{
$$ = new VariableDeclaratorNode($2.left, $2.right);
}
;
ContinueStatement
: "CONTINUE" ";"
{
$$ = new ContinueStatementNode();
}
;
BreakStatement
: "BREAK" ";"
{
$$ = new BreakStatementNode();
}
;
ReturnStatement
: "RETURN" ";"
{
$$ = new ReturnStatementNode(null);
}
| "RETURN" Expression ";"
{
$$ = new ReturnStatementNode($2);
}
;
ForStatement
: "FOR" "(" Expression ";" Expression ";" Expression ")" Statement
{
$$ = new ForStatementNode($3, $5, $7, $9);
}
| "FOR" "(" Expression ";" Expression ";" ")" Statement
{
$$ = new ForStatementNode($3, $5, null, $8);
}
| "FOR" "(" Expression ";" ";" Expression ")" Statement
{
$$ = new ForStatementNode($3, null, $6, $8);
}
| "FOR" "(" Expression ";" ";" ")" Statement
{
$$ = new ForStatementNode($3, null, null, $7);
}
| "FOR" "(" ";" Expression ";" Expression ")" Statement
{
$$ = new ForStatementNode(null, $4, $6, $8);
}
| "FOR" "(" ";" Expression ";" ")" Statement
{
$$ = new ForStatementNode(null, $4, null, $7);
}
| "FOR" "(" ";" ";" Expression ")" Statement
{
$$ = new ForStatementNode(null, null, $5, $7);
}
| "FOR" "(" ";" ";" ")" Statement
{
$$ = new ForStatementNode(null, null, null, $6);
}
;
IfStatement
: "IF" "(" Expression ")" Statement
{
$$ = new IfStatementNode($3, $5, null);
}
| "IF" "(" Expression ")" Statement "ELSE" Statement
{
$$ = new IfStatementNode($3, $5, $7);
}
;
Program
: SourceElements EOF
{
@ -517,6 +528,25 @@ FunctionDeclaration
}
;
FunctionExpression
: "FUNCTION" "IDENTIFIER" "(" ")" "{" FunctionBody "}"
{
$$ = new FunctionDeclarationNode(new IdentifierNode($2), [], $6, false, false);
}
| "FUNCTION" "IDENTIFIER" "(" FormalParameterList ")" "{" FunctionBody "}"
{
$$ = new FunctionDeclarationNode(new IdentifierNode($2), $4, $7, false, false);
}
| "FUNCTION" "(" ")" "{" FunctionBody "}"
{
$$ = new FunctionDeclarationNode(null, [], $5, false, false);
}
| "FUNCTION" "(" FormalParameterList ")" "{" FunctionBody "}"
{
$$ = new FunctionDeclarationNode(null, $3, $6, false, false);
}
;
FormalParameterList
: "IDENTIFIER"
{

4
src/js-to-webclgl.js
View File

@ -47,7 +47,7 @@ var GPU_jsStrToWebclglStr = (function() {
}
// take out the function object, outside the main var declarations
var mainAst = mainObj.body[0].declarations[0].init;
var mainAst = mainObj.body[0].init;
// Capture the original statment code
stateParam.customMainFunctionName = mainAst.id;
@ -75,7 +75,7 @@ var GPU_jsStrToWebclglStr = (function() {
/// @returns the prased openclgl string array
function ast_generic(ast, retArr, stateParam ) {
switch(ast.type) {
case "FunctionExpression":
case "FunctionDeclaration":
return ast_FunctionExpression(ast, retArr, stateParam);
case "ReturnStatement":
return ast_ReturnStatement(ast, retArr, stateParam);

394
src/webclgl-js-parser.js
View File

File diff suppressed because one or more lines are too long