Merge branch 'parser-tokens'

Author: adambeynon

.travis.yml

@@ -15,3 +15,7 @@ notifications:
 matrix:
   allow_failures:
     - rvm: rbx-20mode
+
+branches:
+  except:
+    - parser-tokens

lib/opal/compiler.rb

@@ -107,9 +107,7 @@ def parser_indent
     # returns an array, it must be used incase the internal structure
     # of sexps does change.
     def s(*parts)
-      sexp = Sexp.new(parts)
-      sexp.line = @line
-      sexp
+      Sexp.new(parts)
     end
 
     def fragment(str, sexp = nil)
@@ -181,7 +179,7 @@ def in_while?
     # and compiling it to fragments.
     def process(sexp, level = :expr)
       if handler = handlers[sexp.type]
-        @line = sexp.line
+        #@line = sexp.line
         return handler.new(sexp, level, self).compile_to_fragments
       else
         raise "Unsupported sexp: #{sexp.type}"
@@ -268,7 +266,7 @@ def returns(sexp)
         sexp
       else
         s(:js_return, sexp).tap { |s|
-          s.line = sexp.line
+          #s.line = sexp.line
         }
       end
     end

lib/opal/fragment.rb

@@ -16,7 +16,7 @@ def initialize(code, sexp = nil)
     # In debug mode we may wish to include the original line as a comment
     def to_code
       if @sexp
-        "/*:#{@sexp.line}*/#{@code}"
+        "/*:#{@sexp.line}:#{@sexp.column}*/#{@code}"
       else
         @code
       end

lib/opal/nodes/logic.rb

@@ -148,7 +148,13 @@ class ReturnNode < Base
       children :value
 
       def return_val
-        expr_or_nil value
+        if value.nil?
+          expr(s(:nil))
+        elsif children.size > 1
+          expr(s(:array, *children))
+        else
+          expr(value)
+        end
       end
 
       def return_in_iter?

lib/opal/nodes/module.rb

@@ -31,8 +31,8 @@ def compile
       end
 
       def name_and_base
-        if Symbol === cid or String === cid
-          [cid.to_s, 'self']
+        if cid.type == :const
+          [cid[1].to_s, 'self']
         elsif cid.type == :colon2
           [cid[2].to_s, expr(cid[1])]
         elsif cid.type == :colon3