refactoring

- fix assignment - fix error message - add lexer_test.js - build v0.0.20
mohayonao · May 6, 2014 · b37ce0a · b37ce0a
1 parent 43d6111
commit b37ce0a
Show file tree

Hide file tree

Showing 13 changed files with 9,330 additions and 9,205 deletions.
diff --git a/build/scscript.js b/build/scscript.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scscript",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "author": "Nao Yonamine <mohayonao@gmail.com>",
   "homepage": "http://mohayonao.github.io/SCScript/",
   "bugs": "https://github.com/mohayonao/SCScript/issues",

diff --git a/src/sc/lang/compiler/codegen.js b/src/sc/lang/compiler/codegen.js
@@ -15,7 +15,7 @@
     yield: true
   };
 
-  var Scope = sc.lang.compiler.Scope({
+  var Scope = sc.lang.compiler.scope({
     add_delegate: function(stmt, id, indent, peek, scope) {
       if (stmt.vars.length === 0) {
         this._addNewVariableStatement(stmt, id, indent);
@@ -807,6 +807,6 @@
     return new CodeGen(opts).generate(ast);
   };
 
-  sc.lang.codegen = codegen;
+  sc.lang.compiler.codegen = codegen;
 
 })(sc);
diff --git a/src/sc/lang/compiler/codegen_test.js b/src/sc/lang/compiler/codegen_test.js
@@ -2,13 +2,13 @@
   "use strict";
 
   require("./codegen");
-  require("./compiler_test");
+  require("./test-cases");
 
-  var codegen  = sc.lang.codegen;
+  var codegen  = sc.lang.compiler.codegen;
   var Syntax   = sc.lang.compiler.Syntax;
   var Token    = sc.lang.compiler.Message;
 
-  describe("sc.lang.codegen", function() {
+  describe("sc.lang.compiler.codegen", function() {
     function s(str) {
       str = JSON.stringify(str);
       return '"' + str.substr(1, str.length - 2) + '"';

diff --git a/src/sc/lang/compiler/compiler.js b/src/sc/lang/compiler/compiler.js
@@ -3,87 +3,78 @@
 
   require("./sc");
 
-  var compiler = {};
-
-  compiler.Token = {
-    CharLiteral: "Char",
-    EOF: "<EOF>",
-    FalseLiteral: "False",
-    FloatLiteral: "Float",
-    Identifier: "Identifier",
-    IntegerLiteral: "Integer",
-    Keyword: "Keyword",
-    Label: "Label",
-    NilLiteral: "Nil",
-    Punctuator: "Punctuator",
-    StringLiteral: "String",
-    SymbolLiteral: "Symbol",
-    TrueLiteral: "True"
-  };
-
-  compiler.Syntax = {
-    AssignmentExpression: "AssignmentExpression",
-    BinaryExpression: "BinaryExpression",
-    BlockExpression: "BlockExpression",
-    CallExpression: "CallExpression",
-    FunctionExpression: "FunctionExpression",
-    GlobalExpression: "GlobalExpression",
-    Identifier: "Identifier",
-    ListExpression: "ListExpression",
-    Label: "Label",
-    Literal: "Literal",
-    ObjectExpression: "ObjectExpression",
-    Program: "Program",
-    ThisExpression: "ThisExpression",
-    UnaryExpression: "UnaryExpression",
-    VariableDeclaration: "VariableDeclaration",
-    VariableDeclarator: "VariableDeclarator"
-  };
-
-  compiler.Message = {
-    ArgumentAlreadyDeclared: "argument '%0' already declared",
-    InvalidLHSInAssignment: "invalid left-hand side in assignment",
-    NotImplemented: "not implemented %0",
-    UnexpectedEOS: "unexpected end of input",
-    UnexpectedIdentifier: "unexpected identifier",
-    UnexpectedChar: "unexpected char",
-    UnexpectedLabel: "unexpected label",
-    UnexpectedNumber: "unexpected number",
-    UnexpectedString: "unexpected string",
-    UnexpectedSymbol: "unexpected symbol",
-    UnexpectedToken: "unexpected token %0",
-    VariableAlreadyDeclared: "variable '%0' already declared",
-    VariableNotDefined: "variable '%0' not defined"
-  };
-
-  compiler.Keywords = {
-    var: "keyword",
-    arg: "keyword",
-    const: "keyword",
-    this: "function",
-    thisThread: "function",
-    thisProcess: "function",
-    thisFunction: "function",
-    thisFunctionDef: "function",
+  var compiler = {
+    Token: {
+      CharLiteral: "Char",
+      EOF: "<EOF>",
+      FalseLiteral: "False",
+      FloatLiteral: "Float",
+      Identifier: "Identifier",
+      IntegerLiteral: "Integer",
+      Keyword: "Keyword",
+      Label: "Label",
+      NilLiteral: "Nil",
+      Punctuator: "Punctuator",
+      StringLiteral: "String",
+      SymbolLiteral: "Symbol",
+      TrueLiteral: "True"
+    },
+    Syntax: {
+      AssignmentExpression: "AssignmentExpression",
+      BinaryExpression: "BinaryExpression",
+      BlockExpression: "BlockExpression",
+      CallExpression: "CallExpression",
+      FunctionExpression: "FunctionExpression",
+      GlobalExpression: "GlobalExpression",
+      Identifier: "Identifier",
+      ListExpression: "ListExpression",
+      Label: "Label",
+      Literal: "Literal",
+      ObjectExpression: "ObjectExpression",
+      Program: "Program",
+      ThisExpression: "ThisExpression",
+      UnaryExpression: "UnaryExpression",
+      VariableDeclaration: "VariableDeclaration",
+      VariableDeclarator: "VariableDeclarator"
+    },
+    Message: {
+      ArgumentAlreadyDeclared: "argument '%0' already declared",
+      InvalidLHSInAssignment: "invalid left-hand side in assignment",
+      NotImplemented: "not implemented %0",
+      UnexpectedEOS: "unexpected end of input",
+      UnexpectedIdentifier: "unexpected identifier",
+      UnexpectedNumber: "unexpected number",
+      UnexpectedLiteral: "unexpected %0",
+      UnexpectedToken: "unexpected token %0",
+      VariableAlreadyDeclared: "variable '%0' already declared",
+      VariableNotDefined: "variable '%0' not defined"
+    },
+    Keywords: {
+      var: "keyword",
+      arg: "keyword",
+      const: "keyword",
+      this: "function",
+      thisThread: "function",
+      thisProcess: "function",
+      thisFunction: "function",
+      thisFunctionDef: "function",
+    }
   };
 
   sc.lang.compiler = compiler;
 
   var SCScript = sc.SCScript;
 
   SCScript.tokenize = function(source, opts) {
-    opts = opts || /* istanbul ignore next */ {};
-    opts.tokens = true;
-    return sc.lang.parser.parse(source, opts).tokens || /* istanbul ignore next */ [];
+    return new compiler.lexer(source, opts).tokenize();
   };
 
   SCScript.parse = function(source, opts) {
-    return sc.lang.parser.parse(source, opts);
+    return compiler.parser.parse(source, opts);
   };
 
   SCScript.compile = function(source, opts) {
-    var ast = SCScript.parse(source, opts);
-    return sc.lang.codegen.compile(ast, opts);
+    return compiler.codegen.compile(SCScript.parse(source, opts), opts);
   };
 
 })(sc);