rbelly 2.0.3 → 2.1.1

data/lib/rbelly/nodes/bellejs/class_node.rb

@@ -1,10 +1,11 @@
 module RBelly
   module Nodes
     class ClassNode < Node
-      attr_reader :class_body
-      def initialize(name, body)
+      attr_reader :class_body, :parent
+      def initialize(name, body, parent = nil)
         super(name)
         @class_body = body
+        @parent = parent
       end
     end
   end

data/lib/rbelly/nodes.rb

@@ -27,3 +27,6 @@ require 'rbelly/nodes/var_decl_node'
 #Bellejs
 require 'rbelly/nodes/bellejs/import_node'
 require 'rbelly/nodes/bellejs/class_node'
+require 'rbelly/nodes/bellejs/extends_node'
+require 'rbelly/nodes/bellejs/bellejs_var_statement_node'
+require 'rbelly/nodes/bellejs/bellejs_func_statement_node'

data/lib/rbelly/tokenizer.rb

@@ -11,7 +11,7 @@ module RBelly
     }
 
     BELLEJS_KEYWORDS = %w{
-      import class
+      import class extends public private
     }
 
     RESERVED = %w{

data/lib/rbelly/visitors/dot_visitor.rb

@@ -46,7 +46,7 @@ module RBelly
       %w{
         AssignExprNode BitwiseNotNode BlockNode DeleteNode ElementNode
         ExpressionStatementNode FunctionBodyNode ClassBodyNode LogicalNotNode ReturnNode
-        ThrowNode TypeOfNode UnaryMinusNode UnaryPlusNode VoidNode ImportNode
+        ThrowNode TypeOfNode UnaryMinusNode UnaryPlusNode VoidNode ImportNode ExtendsNode
       }.each do |type|
         define_method(:"visit_#{type}") do |o|
           node = Node.new(@node_index += 1, [type])
@@ -101,7 +101,7 @@ module RBelly
 
       # Name and Value Nodes
       %w{
-        LabelNode PropertyNode GetterPropertyNode SetterPropertyNode VarDeclNode
+        LabelNode PropertyNode GetterPropertyNode SetterPropertyNode VarDeclNode BellejsVar
       }.each do |type|
         define_method(:"visit_#{type}") do |o|
           node = Node.new(@node_index += 1, [type, o.name || 'NULL'])

data/lib/rbelly/visitors/ecma_visitor.rb

@@ -94,9 +94,20 @@ module RBelly
 
       def visit_ClassNode(o)
         "#{indent}class #{o.value}" +
+            (o.parent ? " extends #{o.parent.value.to_s}" : "") +
             "#{o.class_body.accept(self)}"
       end
 
+      def visit_BellejsVarStatementNode(o)
+        "#{o.visibility} " +
+           "#{o.var_statement.accept(self)}"
+      end
+
+      def visit_BellejsFuncStatementNode(o)
+        "#{o.visibility} " +
+            "#{o.func_statement.accept(self)}"
+      end
+
       def visit_ParameterNode(o)
         o.value
       end
@@ -179,6 +190,10 @@ module RBelly
         "import #{o.value.accept(self)};"
       end
 
+      def visit_ExtendsNode(o)
+        "extends #{o.value.accept(self)}"
+      end
+
       def visit_ThrowNode(o)
         "throw #{o.value.accept(self)};"
       end

data/lib/rbelly/visitors/evaluation_visitor.rb

@@ -214,6 +214,10 @@ module RBelly
         o.value.each { |x| x.accept(self) }
       end
 
+      def visit_ExtendsNode(o)
+        o.value.each { |x| x.accept(self) }
+      end
+
       def visit_BitwiseNotNode(o)
         orig = o.value.accept(self)
         number = to_int_32(orig)

data/lib/rbelly/visitors/function_visitor.rb

@@ -42,7 +42,7 @@ module RBelly
         SetterPropertyNode StrictEqualNode StringNode
         SubtractNode SwitchNode ThisNode ThrowNode TrueNode TryNode TypeOfNode
         UnaryMinusNode UnaryPlusNode UnsignedRightShiftNode VarDeclNode
-        VarStatementNode VoidNode WhileNode WithNode ImportNode
+        VarStatementNode VoidNode WhileNode WithNode ImportNode ExtendsNode
       }.each do |type|
         define_method(:"visit_#{type}") do |o|
         end

data/lib/rbelly/visitors/sexp_visitor.rb

@@ -341,6 +341,10 @@ module RBelly
         [:import, *super]
       end
 
+      def visit_ExtendsNode(o)
+        [:extends, *super]
+      end
+
       def visit_FunctionExprNode(o)
         [ :func_expr, *super]
       end

data/lib/rbelly/visitors/visitor.rb

@@ -3,11 +3,11 @@ module RBelly
     class Visitor
       TERMINAL_NODES = %w{
         Break Continue EmptyStatement False Null Number Parameter Regexp Resolve
-        String This True
+        String This True Public Private
       }
       SINGLE_VALUE_NODES = %w{
         Parenthetical AssignExpr BitwiseNot Block Delete Element ExpressionStatement
-        FunctionBody ClassBody LogicalNot Return Throw TypeOf UnaryMinus UnaryPlus Void Import
+        FunctionBody ClassBody LogicalNot Return Throw TypeOf UnaryMinus UnaryPlus Void Import Extends
       }
       BINARY_NODES = %w{
         Add BitAnd BitOr BitXOr CaseClause Comma Divide DoWhile Equal Greater
@@ -30,10 +30,12 @@ module RBelly
       FUNC_CALL_NODES       = %w{ NewExpr FunctionCall }
       FUNC_DECL_NODES       = %w{ FunctionExpr FunctionDecl }
       CLASS_NODES           = %w{ Class }
+      BELLEJS_VAR_NODES     = %w{ BellejsVarStatement }
+      BELLEJS_FUNC_NODES    = %w{ BellejsFuncStatement }
       ALL_NODES = %w{ For ForIn Try BracketAccessor DotAccessor } +
         TERMINAL_NODES + SINGLE_VALUE_NODES + BINARY_NODES + ARRAY_VALUE_NODES +
         NAME_VALUE_NODES + PREFIX_POSTFIX_NODES + CONDITIONAL_NODES +
-        FUNC_CALL_NODES + FUNC_DECL_NODES + CLASS_NODES
+        FUNC_CALL_NODES + FUNC_DECL_NODES + CLASS_NODES + BELLEJS_VAR_NODES
 
       def accept(target)
         target.accept(self)
@@ -105,6 +107,26 @@ module RBelly
         end
       end
 
+      BELLEJS_VAR_NODES.each do |type|
+        define_method(:"visit_#{type}Node") do |o|
+          [
+              o.value ? o.value : nil,
+              o.visibility ? o.visibility : nil,
+              o.var_statement ? o.var_statement : nil
+          ]
+        end
+      end
+
+      BELLEJS_FUNC_NODES.each do |type|
+        define_method(:"visit_#{type}Node") do |o|
+          [
+              o.value ? o.value : nil,
+              o.visibility ? o.visibility : nil,
+              o.func_statement ? o.func_statement : nil
+          ]
+        end
+      end
+
       def visit_ForNode(o)
         [
           o.init ? o.init.accept(self) : nil,

data/test/test_bellejs.rb

@@ -2,9 +2,17 @@ require File.dirname(__FILE__) + "/helper"
 
 class BellejsTest < Test::Unit::TestCase
 
+  PRIVATE_VAR_DECL = "private var cat = 9;"
+  PUBLIC_VAR_DECL = "public var dog = 'large mammal with a tail';"
+  PRIVATE_FUNC_DECL = "private function doStuff(){
+
+}"
   BELLEJS_IMPORT = "import 'fakeJSFileOne.bellejs';"
   BELLEJS_CLASS = "class Dingo{
 
+}"
+  BELLEJS_CLASS_WITH_PARENT = "class Dingo extends Animal{
+
 }"
 
   def test_import_tokenizer
@@ -31,4 +39,38 @@ class BellejsTest < Test::Unit::TestCase
     assert_equal result.to_ecma, BELLEJS_CLASS
   end
 
+  def test_class_parent_tokenizer
+    tokenizer = RBelly::Tokenizer.new
+    result = tokenizer.tokenize "extends"
+    assert_equal result, [[:EXTENDS, "extends"]]
+  end
+
+  def test_class_with_parent
+    parser = RBelly::Parser.new
+    result = parser.parse(BELLEJS_CLASS_WITH_PARENT)
+    assert_equal result.to_ecma, BELLEJS_CLASS_WITH_PARENT
+  end
+
+  def test_public_private_tokenizer
+    tokenizer = RBelly::Tokenizer.new
+    result = tokenizer.tokenize "public"
+    result2 = tokenizer.tokenize "private"
+    assert_equal result, [[:PUBLIC, "public"]]
+    assert_equal result2, [[:PRIVATE, "private"]]
+  end
+
+  def test_public_private_vars
+    parser = RBelly::Parser.new
+    result = parser.parse(PRIVATE_VAR_DECL)
+    result2 = parser.parse(PUBLIC_VAR_DECL)
+    assert_equal result.to_ecma, PRIVATE_VAR_DECL
+    assert_equal result2.to_ecma, PUBLIC_VAR_DECL
+  end
+
+  def test_public_private_funcs
+    parser = RBelly::Parser.new
+    result = parser.parse(PRIVATE_FUNC_DECL)
+    assert_equal result.to_ecma, PRIVATE_FUNC_DECL
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbelly
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc