Every token from lexer stores it original line number (and column)

opal · Nov 22, 2013 · 19a08f4 · 19a08f4
1 parent fca7065
commit 19a08f4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 39 deletions.
diff --git a/lib/opal/compiler.rb b/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

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -434,7 +434,6 @@ def new_op_asgn(op, lhs, rhs)
 
       end
 
-      result.line = lhs.line
       result
     end
 
@@ -529,11 +528,14 @@ def new_var_ref(ref)
         # returns for __FILE__ as it is converted into str
         ref
       when :identifier
-        if scope.has_local? ref[1]
-          s(:lvar, ref[1])
-        else
-          s(:call, nil, ref[1], s(:arglist))
-        end
+        result = if scope.has_local? ref[1]
+                  s(:lvar, ref[1])
+                else
+                  s(:call, nil, ref[1], s(:arglist))
+                end
+
+        result.loc = ref.loc
+        result
       else
         raise "Bad var_ref type: #{ref.type}"
       end

diff --git a/lib/opal/parser/grammar.rb b/lib/opal/parser/grammar.rb
diff --git a/lib/opal/parser/grammar.y b/lib/opal/parser/grammar.y
@@ -175,12 +175,10 @@ rule
                 | expr kAND expr
                     {
                       result = s(:and, val[0], val[2])
-                      result.line = val[0].line
                     }
                 | expr kOR expr
                     {
                       result = s(:or, val[0], val[2])
-                      result.line = val[0].line
                     }
                 | kNOT expr
                     {
@@ -723,7 +721,6 @@ rule
                     bodystmt kEND
                     {
                       result = s(:begin, val[2])
-                      result.line = val[1]
                     }
                 | tLPAREN_ARG expr opt_nl tRPAREN
                     {
@@ -816,7 +813,6 @@ rule
                     compstmt kEND
                     {
                       result = s(:while, val[2], val[5])
-                      result.line = val[1]
                     }
                 | kUNTIL
                     {
@@ -830,22 +826,18 @@ rule
                     compstmt kEND
                     {
                       result = s(:until, val[2], val[5])
-                      result.line = val[1]
                     }
                 | kCASE expr_value opt_terms case_body kEND
                     {
                       result = s(:case, val[1], *val[3])
-                      result.line = val[1].line
                     }
                 | kCASE opt_terms case_body kEND
                     {
                       result = s(:case, nil, *val[2])
-                      # result.line = val[2].line
                     }
                 | kCASE opt_terms kELSE compstmt kEND
                     {
                       result = s(:case, nil, val[3])
-                      # result.line = val[3].line
                     }
                 | kFOR mlhs kIN
                     {
@@ -1065,7 +1057,6 @@ opt_block_args_tail: tCOMMA block_args_tail
                     opt_block_var compstmt kEND
                     {
                       result = new_iter val[2], val[3]
-                      result.line = val[1]
                       pop_scope
                     }
 
@@ -1114,7 +1105,6 @@ opt_block_args_tail: tCOMMA block_args_tail
                     opt_block_var compstmt tRCURLY
                     {
                       result = new_iter val[2], val[3]
-                      result.line = val[1]
                       pop_scope
                     }
                 | kDO
@@ -1125,7 +1115,6 @@ opt_block_args_tail: tCOMMA block_args_tail
                     opt_block_var compstmt kEND
                     {
                       result = new_iter val[2], val[3]
-                      result.line = val[1]
                       pop_scope
                     }
 
@@ -1136,7 +1125,6 @@ opt_block_args_tail: tCOMMA block_args_tail
                     args then compstmt cases
                     {
                       part = s(:when, s(:array, *val[2]), val[4])
-                      #part.line = val[2].line
                       result = [part]
                       result.push *val[5] if val[5]
                     }

diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -13,6 +13,7 @@ def initialize(source, file)
       @cond       = 0
       @cmdarg     = 0
       @line       = 1
+      @column     = 0
       @file       = file
 
       @scanner = StringScanner.new(source)
@@ -97,7 +98,7 @@ def matched
 
     def next_token
       old = self.yylex
-      loc = []
+      loc = [@line, @column]
       [old[0], [old[1], loc]]
     end
 

diff --git a/lib/opal/parser/sexp.rb b/lib/opal/parser/sexp.rb
@@ -1,8 +1,6 @@
 module Opal
   class Sexp
 
-    attr_accessor :line
-    attr_accessor :end_line
     attr_reader :array
 
     attr_accessor :loc
@@ -55,8 +53,20 @@ def ==(other)
 
     alias eql? ==
 
+    def line
+      @loc && @loc[0]
+    end
+
+    def column
+      @loc && @loc[1]
+    end
+
     def inspect
-      "(#{@array.map { |e| e.inspect }.join ' '})"
+      "(#{@array.map { |e| e.inspect }.join ', '})"
+    end
+
+    def pretty_inspect
+      "(#{line ? "#{line} " : ''}#{@array.map { |e| e.inspect }.join ', '})"
     end
 
     alias to_s inspect