RubyGems - opal - Versions diffs - 0.5.5 → 0.6.0 - Mend

opal 0.5.5 → 0.6.0

Files changed (257) hide show

checksums.yaml +4 -4
data/.travis.yml +40 -9
data/CHANGELOG.md +349 -0
data/Gemfile +7 -8
data/README.md +25 -3
data/Rakefile +4 -2
data/bin/opal +1 -1
data/examples/rack/Gemfile +3 -0
data/examples/rack/app/application.rb +13 -0
data/examples/rack/app/user.rb +21 -0
data/examples/rack/config.ru +7 -0
data/examples/rack/index.html.erb +10 -0
data/examples/sinatra/Gemfile +4 -0
data/examples/sinatra/app/application.rb +7 -0
data/examples/sinatra/config.ru +21 -0
data/lib/mspec/opal/rake_task.rb +29 -8
data/lib/mspec/opal/runner.rb +5 -4
data/lib/opal.rb +1 -0
data/lib/opal/builder.rb +0 -28
data/lib/opal/cli.rb +0 -14
data/lib/opal/compiler.rb +12 -11
data/lib/opal/fragment.rb +8 -1
data/lib/opal/nodes/array.rb +1 -1
data/lib/opal/nodes/base.rb +4 -0
data/lib/opal/nodes/call.rb +6 -2
data/lib/opal/nodes/call_special.rb +1 -1
data/lib/opal/nodes/class.rb +2 -2
data/lib/opal/nodes/constants.rb +3 -1
data/lib/opal/nodes/helpers.rb +23 -14
data/lib/opal/nodes/if.rb +16 -9
data/lib/opal/nodes/literal.rb +37 -5
data/lib/opal/nodes/logic.rb +7 -1
data/lib/opal/nodes/module.rb +2 -2
data/lib/opal/nodes/scope.rb +13 -2
data/lib/opal/nodes/top.rb +9 -0
data/lib/opal/nodes/variables.rb +5 -2
data/lib/opal/parser.rb +306 -71
data/lib/opal/parser/grammar.rb +2667 -2775
data/lib/opal/parser/grammar.y +177 -233
data/lib/opal/parser/lexer.rb +511 -427
data/lib/opal/parser/sexp.rb +15 -3
data/lib/opal/source_map.rb +8 -4
data/lib/opal/sprockets.rb +4 -0
data/lib/opal/sprockets/cache_key_fix.rb +17 -0
data/lib/opal/sprockets/environment.rb +21 -0
data/lib/opal/sprockets/erb.rb +30 -0
data/lib/opal/sprockets/processor.rb +127 -0
data/lib/opal/sprockets/server.rb +166 -0
data/lib/opal/util.rb +29 -0
data/lib/opal/version.rb +1 -1
data/opal.gemspec +1 -1
data/opal/corelib/array.rb +106 -187
data/opal/corelib/array/inheritance.rb +113 -0
data/opal/corelib/basic_object.rb +6 -2
data/opal/corelib/boolean.rb +4 -0
data/opal/corelib/class.rb +2 -0
data/opal/corelib/complex.rb +3 -0
data/opal/corelib/enumerable.rb +75 -8
data/opal/corelib/enumerator.rb +2 -0
data/opal/corelib/error.rb +23 -23
data/opal/corelib/hash.rb +5 -5
data/opal/corelib/helpers.rb +51 -16
data/opal/corelib/io.rb +7 -24
data/opal/corelib/kernel.rb +23 -11
data/opal/corelib/module.rb +44 -47
data/opal/corelib/nil_class.rb +4 -0
data/opal/corelib/numeric.rb +101 -15
data/opal/corelib/range.rb +2 -0
data/opal/corelib/rational.rb +3 -0
data/opal/corelib/regexp.rb +36 -17
data/opal/corelib/runtime.js +22 -7
data/opal/corelib/string.rb +213 -110
data/opal/corelib/string/inheritance.rb +78 -0
data/opal/corelib/struct.rb +8 -0
data/opal/corelib/time.rb +54 -42
data/opal/corelib/variables.rb +24 -0
data/opal/opal.rb +5 -27
data/spec/cli/compiler_spec.rb +136 -0
data/spec/cli/dependency_resolver_spec.rb +40 -0
data/spec/cli/lexer_spec.rb +110 -0
data/spec/cli/parser/alias_spec.rb +26 -0
data/spec/cli/parser/and_spec.rb +13 -0
data/spec/cli/parser/attrasgn_spec.rb +28 -0
data/spec/cli/parser/begin_spec.rb +42 -0
data/spec/cli/parser/block_spec.rb +12 -0
data/spec/cli/parser/break_spec.rb +17 -0
data/spec/cli/parser/call_spec.rb +139 -0
data/spec/cli/parser/class_spec.rb +35 -0
data/spec/cli/parser/comments_spec.rb +11 -0
data/spec/cli/parser/def_spec.rb +61 -0
data/spec/cli/parser/if_spec.rb +26 -0
data/spec/cli/parser/iter_spec.rb +59 -0
data/spec/cli/parser/lambda_spec.rb +64 -0
data/spec/cli/parser/literal_spec.rb +113 -0
data/spec/cli/parser/masgn_spec.rb +37 -0
data/spec/cli/parser/module_spec.rb +27 -0
data/spec/cli/parser/not_spec.rb +27 -0
data/spec/cli/parser/op_asgn1_spec.rb +23 -0
data/spec/cli/parser/op_asgn2_spec.rb +23 -0
data/spec/cli/parser/or_spec.rb +13 -0
data/spec/cli/parser/return_spec.rb +17 -0
data/spec/cli/parser/sclass_spec.rb +21 -0
data/spec/cli/parser/string_spec.rb +269 -0
data/spec/cli/parser/super_spec.rb +20 -0
data/spec/cli/parser/undef_spec.rb +15 -0
data/spec/cli/parser/unless_spec.rb +13 -0
data/spec/cli/parser/variables_spec.rb +92 -0
data/spec/cli/parser/while_spec.rb +15 -0
data/spec/cli/parser/yield_spec.rb +20 -0
data/spec/cli/spec_helper.rb +31 -11
data/spec/opal/core/array/set_range_to_array_spec.rb +7 -0
data/spec/opal/core/date_spec.rb +122 -0
data/spec/opal/core/language/predefined_spec.rb +1 -1
data/spec/opal/core/runtime/operator_call_spec.rb +13 -0
data/spec/opal/core/runtime/truthy_spec.rb +23 -0
data/spec/opal/filters/bugs/array.rb +96 -87
data/spec/opal/filters/bugs/basic_object.rb +9 -0
data/spec/opal/filters/bugs/class.rb +16 -0
data/spec/opal/filters/bugs/enumerable.rb +54 -0
data/spec/opal/filters/bugs/language.rb +37 -3
data/spec/opal/filters/bugs/math.rb +93 -0
data/spec/opal/filters/bugs/nil.rb +7 -0
data/spec/opal/filters/bugs/numeric.rb +19 -0
data/spec/opal/filters/bugs/opal.rb +12 -0
data/spec/opal/filters/bugs/regexp.rb +0 -2
data/spec/opal/filters/bugs/string.rb +317 -19
data/spec/opal/filters/bugs/struct.rb +29 -0
data/spec/opal/filters/bugs/time.rb +130 -9
data/spec/opal/filters/unsupported/encoding.rb +52 -4
data/spec/opal/filters/unsupported/enumerator.rb +0 -3
data/spec/opal/filters/unsupported/integer_size.rb +7 -0
data/spec/opal/filters/unsupported/method_added.rb +10 -0
data/spec/opal/filters/unsupported/mutable_strings.rb +299 -1
data/spec/opal/filters/unsupported/private_constants.rb +30 -0
data/spec/opal/filters/unsupported/private_methods.rb +16 -0
data/spec/opal/filters/unsupported/random.rb +4 -0
data/spec/opal/filters/unsupported/tainted.rb +53 -0
data/spec/opal/filters/unsupported/trusted.rb +5 -0
data/spec/opal/rubyspecs +167 -234
data/spec/opal/spec_helper.rb +3 -0
data/spec/opal/stdlib/promise/error_spec.rb +15 -0
data/spec/opal/stdlib/promise/rescue_spec.rb +35 -0
data/spec/opal/stdlib/promise/then_spec.rb +54 -0
data/spec/opal/stdlib/promise/trace_spec.rb +35 -0
data/spec/opal/stdlib/promise/value_spec.rb +15 -0
data/spec/opal/stdlib/promise/when_spec.rb +34 -0
data/stdlib/base64.rb +152 -0
data/stdlib/date.rb +82 -49
data/{opal/corelib → stdlib}/encoding.rb +3 -1
data/stdlib/erb.rb +0 -1
data/stdlib/json.rb +10 -26
data/stdlib/math.rb +370 -0
data/stdlib/native.rb +40 -33
data/stdlib/opal-parser.rb +7 -4
data/stdlib/promise.rb +292 -0
data/stdlib/strscan.rb +1 -1
data/stdlib/template.rb +1 -3
data/stdlib/time.rb +9 -0
metadata +143 -204
data/doc/compiler.md +0 -42
data/doc/compiler_options.md +0 -5
data/doc/examples/node_http_server.rb +0 -49
data/doc/external_libraries.md +0 -9
data/doc/generated_javascript.md +0 -272
data/doc/home.md +0 -17
data/doc/method_missing.md +0 -58
data/doc/static_applications.md +0 -60
data/doc/using_ruby_from_javascript.md +0 -18
data/doc/using_sprockets.md +0 -65
data/spec/opal/core/numeric/abs_spec.rb +0 -12
data/spec/opal/core/numeric/downto_spec.rb +0 -19
data/spec/opal/core/numeric/equal_value_spec.rb +0 -9
data/spec/opal/core/numeric/even_spec.rb +0 -21
data/spec/opal/core/numeric/magnitude_spec.rb +0 -12
data/spec/opal/core/numeric/odd_spec.rb +0 -21
data/spec/opal/core/string/chop_spec.rb +0 -10
data/spec/opal/core/string/chr_spec.rb +0 -13
data/spec/opal/core/string/clone_spec.rb +0 -8
data/spec/opal/core/string/comparison_spec.rb +0 -13
data/spec/opal/core/string/dup_spec.rb +0 -8
data/spec/opal/core/string/element_reference_spec.rb +0 -96
data/spec/opal/core/string/fixtures/classes.rb +0 -49
data/spec/opal/core/string/format_spec.rb +0 -9
data/spec/opal/core/string/freeze_spec.rb +0 -15
data/spec/opal/core/string/gsub_spec.rb +0 -31
data/spec/opal/core/string/lines_spec.rb +0 -9
data/spec/opal/core/string/ljust_spec.rb +0 -32
data/spec/opal/core/string/lstrip_spec.rb +0 -7
data/spec/opal/core/string/match_spec.rb +0 -49
data/spec/opal/core/string/next_spec.rb +0 -10
data/spec/opal/core/string/ord_spec.rb +0 -9
data/spec/opal/core/string/partition_spec.rb +0 -10
data/spec/opal/core/string/rindex_spec.rb +0 -50
data/spec/opal/core/string/rjust_spec.rb +0 -32
data/spec/opal/core/string/rstrip_spec.rb +0 -7
data/spec/opal/core/string/scan_spec.rb +0 -66
data/spec/opal/core/string/slice_spec.rb +0 -74
data/spec/opal/core/string/split_spec.rb +0 -5
data/spec/opal/core/string/strip_spec.rb +0 -6
data/spec/opal/core/string/sub_spec.rb +0 -38
data/spec/opal/core/string/succ_spec.rb +0 -10
data/spec/opal/core/string/sum_spec.rb +0 -5
data/spec/opal/core/string/to_f_spec.rb +0 -14
data/spec/opal/core/string/to_i_spec.rb +0 -25
data/spec/opal/core/string/tr_s_spec.rb +0 -31
data/spec/opal/core/string/tr_spec.rb +0 -31
data/spec/opal/filters/bugs/parser.rb +0 -10
data/spec/opal/filters/unsupported/immutable_strings.rb +0 -24
data/spec/opal/filters/unsupported/string_subclasses.rb +0 -8
data/spec/opal/parser/alias_spec.rb +0 -26
data/spec/opal/parser/and_spec.rb +0 -13
data/spec/opal/parser/array_spec.rb +0 -22
data/spec/opal/parser/attrasgn_spec.rb +0 -28
data/spec/opal/parser/begin_spec.rb +0 -42
data/spec/opal/parser/block_spec.rb +0 -12
data/spec/opal/parser/break_spec.rb +0 -17
data/spec/opal/parser/call_spec.rb +0 -131
data/spec/opal/parser/class_spec.rb +0 -35
data/spec/opal/parser/const_spec.rb +0 -13
data/spec/opal/parser/cvar_spec.rb +0 -11
data/spec/opal/parser/def_spec.rb +0 -61
data/spec/opal/parser/false_spec.rb +0 -17
data/spec/opal/parser/file_spec.rb +0 -7
data/spec/opal/parser/gvar_spec.rb +0 -13
data/spec/opal/parser/hash_spec.rb +0 -17
data/spec/opal/parser/heredoc_spec.rb +0 -30
data/spec/opal/parser/iasgn_spec.rb +0 -9
data/spec/opal/parser/if_spec.rb +0 -26
data/spec/opal/parser/int_spec.rb +0 -13
data/spec/opal/parser/iter_spec.rb +0 -59
data/spec/opal/parser/ivar_spec.rb +0 -9
data/spec/opal/parser/lambda_spec.rb +0 -64
data/spec/opal/parser/lasgn_spec.rb +0 -8
data/spec/opal/parser/line_spec.rb +0 -8
data/spec/opal/parser/lvar_spec.rb +0 -38
data/spec/opal/parser/masgn_spec.rb +0 -37
data/spec/opal/parser/module_spec.rb +0 -27
data/spec/opal/parser/nil_spec.rb +0 -17
data/spec/opal/parser/not_spec.rb +0 -27
data/spec/opal/parser/nth_ref_spec.rb +0 -13
data/spec/opal/parser/op_asgn1_spec.rb +0 -23
data/spec/opal/parser/op_asgn2_spec.rb +0 -23
data/spec/opal/parser/or_spec.rb +0 -13
data/spec/opal/parser/parse_spec.rb +0 -66
data/spec/opal/parser/regexp_spec.rb +0 -16
data/spec/opal/parser/return_spec.rb +0 -17
data/spec/opal/parser/sclass_spec.rb +0 -21
data/spec/opal/parser/self_spec.rb +0 -17
data/spec/opal/parser/str_spec.rb +0 -107
data/spec/opal/parser/string_spec.rb +0 -8
data/spec/opal/parser/super_spec.rb +0 -20
data/spec/opal/parser/true_spec.rb +0 -17
data/spec/opal/parser/undef_spec.rb +0 -15
data/spec/opal/parser/unless_spec.rb +0 -13
data/spec/opal/parser/while_spec.rb +0 -15
data/spec/opal/parser/xstr_spec.rb +0 -116
data/spec/opal/parser/yield_spec.rb +0 -20

data/Rakefile CHANGED

@@ -17,6 +17,8 @@ task :default => [:rspec, :mspec]
 desc 'Build opal.js and opal-parser.js to build/'
 task :dist do
+  require 'opal/util'
   Opal::Processor.arity_check_enabled = false
   Opal::Processor.const_missing_enabled = false
@@ -31,8 +33,8 @@ task :dist do
     $stdout.flush
     src = env[lib].to_s
-    min = Opal::Builder::Util.uglify src
-    gzp = Opal::Builder::Util.gzip min
+    min = Opal::Util.uglify src
+    gzp = Opal::Util.gzip min
     File.open("build/#{lib}.js", 'w+')        { |f| f << src }
     File.open("build/#{lib}.min.js", 'w+')    { |f| f << min } if min

data/bin/opal CHANGED

@@ -7,7 +7,7 @@ options.parse!
 require 'opal/cli'
 if ARGV.empty? and !options.options[:evals]
-  p options
+  puts options
 else
   cli = Opal::CLI.new options.options.merge(:filename => ARGV.first)
   begin

data/examples/rack/Gemfile ADDED

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'opal', :path => '../../'

data/examples/rack/app/application.rb ADDED

@@ -0,0 +1,13 @@
+require 'opal'
+require 'user'
+module MyApp
+  class Application
+    def initialize
+      @user = User.new('Bill')
+      @user.authenticated?
+    end
+  end
+end
+MyApp::Application.new

data/examples/rack/app/user.rb ADDED

@@ -0,0 +1,21 @@
+class User
+  def initialize(name)
+    @name = name
+  end
+  def authenticated?
+    if admin? or special_permission?
+      true
+    else
+      raise "not authenticated"
+    end
+  end
+  def admin?
+    @name == 'Bob'
+  end
+  def special_permission?
+    false
+  end
+end

data/examples/rack/config.ru ADDED

@@ -0,0 +1,7 @@
+require 'bundler'
+Bundler.require
+run Opal::Server.new { |s|
+  s.main = 'application'
+  s.append_path 'app'
+}

data/examples/rack/index.html.erb ADDED

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>opal-sprockets demo</title>
+    <%= javascript_include_tag 'application' %>
+  </head>
+  <body>
+  </body>
+</html>

data/examples/sinatra/Gemfile ADDED

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'opal', :path => '../../opal'
+gem 'sinatra'

data/examples/sinatra/app/application.rb ADDED

@@ -0,0 +1,7 @@
+require 'opal'
+def alert(msg)
+  `alert(msg)`
+end
+alert "Hi there!"

data/examples/sinatra/config.ru ADDED

@@ -0,0 +1,21 @@
+require 'opal'
+require 'sinatra'
+get '/' do
+  <<-EOS
+    <!doctype html>
+    <html>
+      <head>
+        <script src="/assets/application.js"></script>
+      </head>
+    </html>
+  EOS
+end
+map '/assets' do
+  env = Opal::Environment.new
+  env.append_path 'app'
+  run env
+end
+run Sinatra::Application

data/lib/mspec/opal/rake_task.rb CHANGED

@@ -21,7 +21,7 @@ end
 require 'rack'
 require 'webrick'
-require 'opal-sprockets'
 module MSpec
   module Opal
     DEFAULT_PATTERN = 'spec/opal/{parser,core,compiler,stdlib}/**/*_spec.rb'
@@ -43,10 +43,11 @@ module MSpec
           desc 'Build specs to build/specs.js and build/specs.min.js'
           task :build do
+            require 'opal/util'
             path = './build/specs.js'
             min_path = './build/specs.min.js'
             Environment.new.build_specs(path)
-            min = ::Opal::Builder::Util.uglify File.read(path)
+            min = ::Opal::Util.uglify File.read(path)
             File.open(min_path, 'w') { |f| f << min_path }
           end
         end
@@ -61,7 +62,7 @@ module MSpec
         @port = 9999
       end
-      attr_reader :app, :server_pid
+      attr_reader :app, :server
       attr_accessor :port
       def passed?
@@ -76,12 +77,11 @@ module MSpec
       rescue => e
         puts e.message
       ensure
-        stop_server if server_pid
+        stop_server if server
       end
       def stop_server
-        Process.kill(:SIGINT, server_pid)
-        Process.wait
+        server.kill
       end
       def start_phantomjs
@@ -94,7 +94,7 @@ module MSpec
       end
       def start_server
-        @server_pid = fork do
+        @server = Thread.new do
           Rack::Server.start(:app => app, :Port => port, :AccessLog => [],
             :Logger => WEBrick::Log.new("/dev/null"))
         end
@@ -139,7 +139,8 @@ module MSpec
       end
       def build_min file = "#{basedir}/build/specs.min.js"
-        build ::Opal::Builder::Util.uglify(specs.to_s), file
+        require 'opal/util'
+        build ::Opal::Util.uglify(specs.to_s), file
       end
       def files
@@ -157,6 +158,26 @@ module MSpec
       end
       def rubyspec_paths
+        rubyspec_dir = "#{basedir}/rubyspec"
+        rubyspec_white_list.map do |path|
+          dirname = File.join rubyspec_dir, path
+          if File.directory? dirname
+            rubyspec_paths_in_dir(dirname, path)
+          else
+            path
+          end
+        end
+      end
+      def rubyspec_paths_in_dir(dirname, path)
+        Dir.entries(dirname).select do |spec|
+          spec.end_with? '.rb'
+        end.map do |spec|
+          File.join path, spec
+        end
+      end
+      def rubyspec_white_list
         File.read("#{basedir}/rubyspecs").split("\n").reject do |line|
           line.empty? || line.start_with?('#')
         end

data/lib/mspec/opal/runner.rb CHANGED

@@ -123,11 +123,11 @@ end
 class PhantomFormatter < BrowserFormatter
   def green(str)
-    `console.log('\\033[32m' + str + '\\033[0m')`
+    `console.log('\033[32m' + str + '\033[0m')`
   end
   def red(str)
-    `console.log('\\033[31m' + str + '\\033[0m')`
+    `console.log('\033[31m' + str + '\033[0m')`
   end
   def log(str)
@@ -176,8 +176,9 @@ end
 module OutputSilencer
   def silence_stdout
     original_stdout = $stdout
-    new_stdout = Object.new
-    `#{new_stdout}.$puts = function(){}`
+    new_stdout = IO.new
+    new_stdout.extend IO::Writable
+    def new_stdout.write(string) end
     begin
       $stdout = new_stdout
       yield

data/lib/opal.rb CHANGED

@@ -1,6 +1,7 @@
 require 'opal/compiler'
 require 'opal/builder'
 require 'opal/erb'
+require 'opal/sprockets'
 require 'opal/version'
 # Opal is a ruby to javascript compiler, with a runtime for running

data/lib/opal/builder.rb CHANGED

@@ -94,33 +94,5 @@ module Opal
     def build_erb(path)
       ::ERB.new(File.read(path)).result binding
     end
-    module Util
-      extend self
-      # Used for uglifying source to minify
-      def uglify(str)
-        IO.popen('uglifyjs 2> /dev/null', 'r+') do |i|
-          i.puts str
-          i.close_write
-          return i.read
-        end
-      rescue Errno::ENOENT
-        $stderr.puts '"uglifyjs" command not found (install with: "npm install -g uglify-js")'
-        nil
-      end
-      # Gzip code to check file size
-      def gzip(str)
-        IO.popen('gzip -f 2> /dev/null', 'r+') do |i|
-          i.puts str
-          i.close_write
-          return i.read
-        end
-      rescue Errno::ENOENT
-        $stderr.puts '"gzip" command not found, it is required to produce the .gz version'
-        nil
-      end
-    end
   end
 end

data/lib/opal/cli.rb CHANGED

@@ -123,7 +123,6 @@ module Opal
     # PROCESSOR
     def set_processor_options
-      require_opal_sprockets
       processor_options.each do |option|
         key = option.to_sym
         next unless options.has_key? key
@@ -160,7 +159,6 @@ module Opal
     end
     def server
-      require_opal_sprockets
       @server ||= Opal::Server.new do |s|
         load_paths.each do |path|
           s.append_path path
@@ -169,18 +167,6 @@ module Opal
       end
     end
-    def require_opal_sprockets
-      begin
-        require 'opal-sprockets'
-      rescue LoadError
-        $stderr.puts 'Opal executable requires opal-sprockets to be fully functional.'
-        $stderr.puts 'You can install it with rubygems:'
-        $stderr.puts ''
-        $stderr.puts '    gem install opal-sprockets'
-        exit -1
-      end
-    end
     ##
     # OUTPUT

data/lib/opal/compiler.rb CHANGED

@@ -49,8 +49,10 @@ module Opal
     # Current case_stmt
     attr_reader :case_stmt
+    # Any content in __END__ special construct
+    attr_reader :eof_content
     def initialize
-      @line = 1
       @indent = ''
       @unique = 0
       @options = {}
@@ -60,8 +62,10 @@ module Opal
     def compile(source, options = {})
       @source = source
       @options.update options
+      @parser = Parser.new
-      @sexp = s(:top, Parser.new.parse(@source, self.file) || s(:nil))
+      @sexp = s(:top, @parser.parse(@source, self.file) || s(:nil))
+      @eof_content = @parser.lexer.eof_content
       @fragments = process(@sexp).flatten
@@ -85,15 +89,15 @@ module Opal
     # This is called when a parsing/processing error occurs. This
     # method simply appends the filename and curent line number onto
     # the message and raises it.
-    def error(msg)
-      raise SyntaxError, "#{msg} :#{file}:#{@line}"
+    def error(msg, line = nil)
+      raise SyntaxError, "#{msg} :#{file}:#{line}"
     end
     # This is called when a parsing/processing warning occurs. This
     # method simply appends the filename and curent line number onto
     # the message and issues a warning.
-    def warning(msg)
-      warn "#{msg} :#{file}:#{@line}"
+    def warning(msg, line = nil)
+      warn "#{msg} :#{file}:#{line}"
     end
     # Instances of `Scope` can use this to determine the current
@@ -107,9 +111,7 @@ module Opal
     # 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 +183,6 @@ module Opal
     # and compiling it to fragments.
     def process(sexp, level = :expr)
       if handler = handlers[sexp.type]
-        @line = sexp.line
         return handler.new(sexp, level, self).compile_to_fragments
       else
         raise "Unsupported sexp: #{sexp.type}"
@@ -268,7 +269,7 @@ module Opal
         sexp
       else
         s(:js_return, sexp).tap { |s|
-          s.line = sexp.line
+          s.source = sexp.source
         }
       end
     end

data/lib/opal/fragment.rb CHANGED

@@ -16,12 +16,15 @@ module Opal
     # 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
     end
+    # debug:
+    # alias code to_code
     # inspect the contents of this fragment, f("fooo")
     def inspect
       "f(#{@code.inspect})"
@@ -30,5 +33,9 @@ module Opal
     def line
       @sexp.line if @sexp
     end
+    def column
+      @sexp.column if @sexp
+    end
   end
 end

data/lib/opal/nodes/array.rb CHANGED

@@ -1,4 +1,4 @@
-require 'opal/nodes/array'
+require 'opal/nodes/base'
 module Opal
   module Nodes

data/lib/opal/nodes/base.rb CHANGED

@@ -123,6 +123,10 @@ module Opal
         scope.add_scope_ivar name
       end
+      def add_gvar(name)
+        scope.add_scope_gvar name
+      end
       def add_temp(temp)
         scope.add_scope_temp temp
       end

data/lib/opal/nodes/call.rb CHANGED

@@ -140,6 +140,10 @@ module Opal
         end
       end
+      add_special :debugger do
+        fragment 'debugger'
+      end
       class DependencyResolver
         def initialize(compiler, sexp)
           @compiler = compiler
@@ -174,9 +178,9 @@ module Opal
           msg = "Cannot handle dynamic require"
           case @compiler.dynamic_require_severity
           when :error
-            @compiler.error msg
+            @compiler.error msg, @sexp.line
           when :warning
-            @compiler.warning msg
+            @compiler.warning msg, @sexp.line
           end
         end