Replace some Opal references with $opal in generated code

opal · Aug 2, 2013 · d68c2e2 · d68c2e2
1 parent c018aed
commit d68c2e2
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -833,7 +833,7 @@ def process_call(sexp, level)
           lvar = meth.intern
           lvar = "#{lvar}$" if RESERVED.include? lvar
           call = s(:call, s(:self), meth.intern, s(:arglist))
-          [fragment("((#{t} = Opal.irb_vars.#{lvar}) == null ? ", sexp), process(call, :expr), fragment(" : #{t})", sexp)]
+          [fragment("((#{t} = $opal.irb_vars.#{lvar}) == null ? ", sexp), process(call, :expr), fragment(" : #{t})", sexp)]
         }
       end
 
@@ -999,7 +999,7 @@ def process_class(sexp, level)
         base = process(cid[1], :expr)
         name = cid[2].to_s
       elsif cid[0] == :colon3
-        base = process(s(:js_tmp, 'Opal.Object'), :expr)
+        base = process(s(:js_tmp, '$opal.Object'), :expr)
         name = cid[1].to_s
       else
         raise "Bad receiver in class"
@@ -1076,7 +1076,7 @@ def process_module(sexp, level)
         base = process(cid[1], :expr)
         name = cid[2].to_s
       elsif cid[0] == :colon3
-        base = fragment('Opal.Object', sexp)
+        base = fragment('$opal.Object', sexp)
         name = cid[1].to_s
       else
         raise "Bad receiver in class"
@@ -1220,7 +1220,7 @@ def js_def(recvr, mid, args, stmts, line, end_line, sexp)
 
           if @scope.catch_return
             code.unshift f("try {\n", sexp)
-            code.push f("\n} catch($returner) { if ($returner === Opal.returner) { return $returner.$v; } throw $returner; }", sexp)
+            code.push f("\n} catch($returner) { if ($returner === $opal.returner) { return $returner.$v; } throw $returner; }", sexp)
           end
         end
       end
@@ -1570,7 +1570,7 @@ def process_lasgn(sexp, level)
       lvar = "#{lvar}$".to_sym if RESERVED.include? lvar.to_s
 
       if @irb_vars and @scope.top?
-        [fragment("Opal.irb_vars.#{lvar} = ", sexp), process(rhs, :expr)]
+        [fragment("$opal.irb_vars.#{lvar} = ", sexp), process(rhs, :expr)]
       else
         @scope.add_local lvar
         rhs = process(rhs, :expr)
@@ -1591,7 +1591,7 @@ def process_lvar(sexp, level)
       lvar = "#{lvar}$" if RESERVED.include? lvar
 
       if @irb_vars and @scope.top?
-        with_temp { |t| fragment("((#{t} = Opal.irb_vars.#{lvar}) == null ? nil : #{t})", sexp) }
+        with_temp { |t| fragment("((#{t} = $opal.irb_vars.#{lvar}) == null ? nil : #{t})", sexp) }
       else
         fragment(lvar, sexp)
       end
@@ -2026,7 +2026,7 @@ def process_match3(sexp, level)
     # s(:cvar, name)
     def process_cvar(exp, level)
       with_temp do |tmp|
-        fragment(("((%s = Opal.cvars[%s]) == null ? nil : %s)" %
+        fragment(("((%s = $opal.cvars[%s]) == null ? nil : %s)" %
           [tmp, exp.shift.to_s.inspect, tmp]), exp)
       end
     end
@@ -2035,11 +2035,11 @@ def process_cvar(exp, level)
     #
     # s(:cvasgn, :@@name, rhs)
     def process_cvasgn(exp, level)
-      "(Opal.cvars[#{exp.shift.to_s.inspect}] = #{process exp.shift, :expr})"
+      "($opal.cvars[#{exp.shift.to_s.inspect}] = #{process exp.shift, :expr})"
     end
 
     def process_cvdecl(exp, level)
-      [fragment("(Opal.cvars[#{exp.shift.to_s.inspect}] = ", exp), process(exp.shift, :expr), fragment(")", exp)]
+      [fragment("($opal.cvars[#{exp.shift.to_s.inspect}] = ", exp), process(exp.shift, :expr), fragment(")", exp)]
     end
 
     # BASE::NAME