opal 1.5.0 → 1.6.0.alpha1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/build.yml +5 -1
- data/CHANGELOG.md +41 -28
- data/HACKING.md +23 -0
- data/UNRELEASED.md +43 -0
- data/benchmark/run.rb +1 -0
- data/docs/compiled_ruby.md +8 -0
- data/docs/compiler.md +1 -1
- data/docs/compiler_directives.md +1 -1
- data/docs/getting_started.md +17 -0
- data/docs/headless_chrome.md +1 -1
- data/docs/index.md +123 -0
- data/docs/templates.md +37 -37
- data/docs/unsupported_features.md +0 -4
- data/lib/opal/builder.rb +59 -39
- data/lib/opal/builder_scheduler/prefork.rb +259 -0
- data/lib/opal/builder_scheduler/sequential.rb +13 -0
- data/lib/opal/builder_scheduler.rb +29 -0
- data/lib/opal/cache/file_cache.rb +5 -0
- data/lib/opal/cli.rb +22 -18
- data/lib/opal/cli_options.rb +4 -0
- data/lib/opal/cli_runners/chrome.rb +13 -9
- data/lib/opal/cli_runners/chrome_cdp_interface.rb +19 -2
- data/lib/opal/cli_runners/compiler.rb +1 -1
- data/lib/opal/cli_runners/gjs.rb +3 -1
- data/lib/opal/cli_runners/mini_racer.rb +5 -3
- data/lib/opal/cli_runners/nodejs.rb +3 -3
- data/lib/opal/cli_runners/server.rb +13 -28
- data/lib/opal/cli_runners/system_runner.rb +5 -3
- data/lib/opal/cli_runners.rb +7 -6
- data/lib/opal/compiler.rb +25 -2
- data/lib/opal/config.rb +10 -0
- data/lib/opal/nodes/args/ensure_kwargs_are_kwargs.rb +2 -6
- data/lib/opal/nodes/args/extract_kwarg.rb +3 -4
- data/lib/opal/nodes/args/extract_kwargs.rb +3 -1
- data/lib/opal/nodes/args/extract_kwoptarg.rb +1 -1
- data/lib/opal/nodes/args/extract_kwrestarg.rb +4 -1
- data/lib/opal/nodes/args/extract_optarg.rb +1 -1
- data/lib/opal/nodes/args/extract_post_arg.rb +1 -1
- data/lib/opal/nodes/args/extract_post_optarg.rb +1 -1
- data/lib/opal/nodes/args/extract_restarg.rb +2 -2
- data/lib/opal/nodes/args/initialize_iterarg.rb +1 -1
- data/lib/opal/nodes/args/initialize_shadowarg.rb +1 -1
- data/lib/opal/nodes/args/prepare_post_args.rb +4 -2
- data/lib/opal/nodes/base.rb +14 -3
- data/lib/opal/nodes/call.rb +10 -14
- data/lib/opal/nodes/class.rb +3 -1
- data/lib/opal/nodes/closure.rb +250 -0
- data/lib/opal/nodes/def.rb +7 -11
- data/lib/opal/nodes/definitions.rb +4 -2
- data/lib/opal/nodes/if.rb +12 -2
- data/lib/opal/nodes/iter.rb +11 -17
- data/lib/opal/nodes/logic.rb +15 -63
- data/lib/opal/nodes/module.rb +3 -1
- data/lib/opal/nodes/rescue.rb +23 -15
- data/lib/opal/nodes/scope.rb +7 -1
- data/lib/opal/nodes/top.rb +27 -4
- data/lib/opal/nodes/while.rb +42 -26
- data/lib/opal/nodes.rb +1 -0
- data/lib/opal/os.rb +59 -0
- data/lib/opal/rewriter.rb +2 -0
- data/lib/opal/rewriters/returnable_logic.rb +14 -0
- data/lib/opal/rewriters/thrower_finder.rb +90 -0
- data/lib/opal/simple_server.rb +12 -6
- data/lib/opal/source_map/file.rb +1 -1
- data/lib/opal/source_map/map.rb +9 -1
- data/lib/opal/util.rb +1 -1
- data/lib/opal/version.rb +1 -1
- data/opal/corelib/array.rb +68 -3
- data/opal/corelib/basic_object.rb +1 -0
- data/opal/corelib/comparable.rb +1 -1
- data/opal/corelib/complex.rb +1 -0
- data/opal/corelib/constants.rb +2 -2
- data/opal/corelib/enumerable.rb +4 -2
- data/opal/corelib/enumerator/chain.rb +4 -0
- data/opal/corelib/enumerator/generator.rb +5 -3
- data/opal/corelib/enumerator/lazy.rb +3 -1
- data/opal/corelib/enumerator/yielder.rb +2 -4
- data/opal/corelib/enumerator.rb +3 -1
- data/opal/corelib/error/errno.rb +2 -1
- data/opal/corelib/error.rb +13 -2
- data/opal/corelib/hash.rb +40 -2
- data/opal/corelib/kernel.rb +56 -5
- data/opal/corelib/module.rb +60 -4
- data/opal/corelib/proc.rb +8 -5
- data/opal/corelib/rational.rb +1 -0
- data/opal/corelib/regexp.rb +15 -1
- data/opal/corelib/runtime.js +307 -238
- data/opal/corelib/string/encoding.rb +0 -6
- data/opal/corelib/string.rb +28 -7
- data/opal/corelib/time.rb +18 -12
- data/opal/corelib/unsupported.rb +2 -14
- data/spec/filters/bugs/delegate.rb +11 -0
- data/spec/filters/bugs/kernel.rb +1 -3
- data/spec/filters/bugs/language.rb +3 -23
- data/spec/filters/bugs/method.rb +0 -1
- data/spec/filters/bugs/module.rb +0 -3
- data/spec/filters/bugs/proc.rb +0 -3
- data/spec/filters/bugs/set.rb +4 -16
- data/spec/filters/bugs/stringscanner.rb +0 -1
- data/spec/filters/bugs/unboundmethod.rb +0 -2
- data/spec/filters/unsupported/array.rb +0 -58
- data/spec/filters/unsupported/freeze.rb +8 -192
- data/spec/filters/unsupported/hash.rb +0 -25
- data/spec/filters/unsupported/kernel.rb +0 -1
- data/spec/filters/unsupported/privacy.rb +17 -0
- data/spec/lib/builder_spec.rb +14 -0
- data/spec/lib/cli_runners/server_spec.rb +2 -3
- data/spec/lib/cli_spec.rb +1 -1
- data/spec/lib/compiler_spec.rb +1 -1
- data/spec/opal/core/language/if_spec.rb +13 -0
- data/spec/opal/core/module_spec.rb +8 -0
- data/spec/ruby_specs +2 -1
- data/spec/spec_helper.rb +4 -0
- data/stdlib/await.rb +44 -7
- data/stdlib/delegate.rb +427 -6
- data/stdlib/headless_chrome.rb +6 -2
- data/stdlib/nodejs/file.rb +2 -1
- data/stdlib/opal-parser.rb +1 -1
- data/stdlib/opal-platform.rb +1 -1
- data/stdlib/opal-replutils.rb +5 -3
- data/stdlib/promise.rb +3 -0
- data/stdlib/rbconfig.rb +4 -1
- data/stdlib/ruby2_keywords.rb +60 -0
- data/stdlib/set.rb +21 -0
- data/stdlib/strscan.rb +27 -49
- data/tasks/performance.rake +41 -35
- data/tasks/releasing.rake +1 -0
- data/tasks/testing/mspec_special_calls.rb +1 -0
- data/tasks/testing.rake +13 -8
- data/test/nodejs/test_await.rb +39 -1
- metadata +27 -14
- data/docs/faq.md +0 -17
- data/lib/opal/rewriters/break_finder.rb +0 -36
- data/spec/opal/core/kernel/freeze_spec.rb +0 -15
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
require 'opal/simple_server'
|
|
4
|
+
|
|
3
5
|
module Opal
|
|
4
6
|
module CliRunners
|
|
5
7
|
class Server
|
|
@@ -11,9 +13,8 @@ module Opal
|
|
|
11
13
|
|
|
12
14
|
def initialize(data)
|
|
13
15
|
options = data[:options] || {}
|
|
14
|
-
builder = data[:builder]
|
|
16
|
+
@builder = data[:builder]
|
|
15
17
|
|
|
16
|
-
@code = builder.to_s + "\n" + builder.source_map.to_data_uri_comment
|
|
17
18
|
@argv = data[:argv] || []
|
|
18
19
|
|
|
19
20
|
@output = data[:output] || $stdout
|
|
@@ -25,7 +26,7 @@ module Opal
|
|
|
25
26
|
@static_folder = File.expand_path(@static_folder) if @static_folder
|
|
26
27
|
end
|
|
27
28
|
|
|
28
|
-
attr_reader :output, :port, :server, :static_folder, :
|
|
29
|
+
attr_reader :output, :port, :server, :static_folder, :builder, :argv
|
|
29
30
|
|
|
30
31
|
def run
|
|
31
32
|
unless argv.empty?
|
|
@@ -35,7 +36,7 @@ module Opal
|
|
|
35
36
|
require 'rack'
|
|
36
37
|
require 'logger'
|
|
37
38
|
|
|
38
|
-
app = build_app(
|
|
39
|
+
app = build_app(builder)
|
|
39
40
|
|
|
40
41
|
@server = Rack::Server.start(
|
|
41
42
|
app: app,
|
|
@@ -49,8 +50,8 @@ module Opal
|
|
|
49
50
|
nil
|
|
50
51
|
end
|
|
51
52
|
|
|
52
|
-
def build_app(
|
|
53
|
-
app = App.new(
|
|
53
|
+
def build_app(builder)
|
|
54
|
+
app = App.new(builder: builder, main: 'cli-runner')
|
|
54
55
|
|
|
55
56
|
if static_folder
|
|
56
57
|
not_found = [404, {}, []]
|
|
@@ -65,30 +66,14 @@ module Opal
|
|
|
65
66
|
app
|
|
66
67
|
end
|
|
67
68
|
|
|
68
|
-
class App
|
|
69
|
-
def initialize(
|
|
70
|
-
@
|
|
69
|
+
class App < SimpleServer
|
|
70
|
+
def initialize(options = {})
|
|
71
|
+
@builder = options.fetch(:builder)
|
|
72
|
+
super
|
|
71
73
|
end
|
|
72
74
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
<html>
|
|
76
|
-
<head>
|
|
77
|
-
<meta charset="utf-8"/>
|
|
78
|
-
<script src="/cli_runner.js"></script>
|
|
79
|
-
</head>
|
|
80
|
-
</html>
|
|
81
|
-
HTML
|
|
82
|
-
|
|
83
|
-
def call(env)
|
|
84
|
-
case env['PATH_INFO']
|
|
85
|
-
when '/'
|
|
86
|
-
[200, { 'Content-Type' => 'text/html' }, [BODY]]
|
|
87
|
-
when '/cli_runner.js'
|
|
88
|
-
[200, { 'Content-Type' => 'text/javascript' }, [@source]]
|
|
89
|
-
else
|
|
90
|
-
[404, {}, ['not found']]
|
|
91
|
-
end
|
|
75
|
+
def builder(_)
|
|
76
|
+
@builder.call
|
|
92
77
|
end
|
|
93
78
|
end
|
|
94
79
|
end
|
|
@@ -13,7 +13,7 @@ require 'tempfile'
|
|
|
13
13
|
# @yieldreturn command [Array<String>] the command to be used in the system call
|
|
14
14
|
SystemRunner = ->(data, &block) {
|
|
15
15
|
options = data[:options] || {}
|
|
16
|
-
builder = data.fetch(:builder)
|
|
16
|
+
builder = data.fetch(:builder).call
|
|
17
17
|
output = data.fetch(:output)
|
|
18
18
|
|
|
19
19
|
env = options.fetch(:env, {})
|
|
@@ -23,11 +23,13 @@ SystemRunner = ->(data, &block) {
|
|
|
23
23
|
# Temporary issue with UTF-8, Base64 and source maps
|
|
24
24
|
code += "\n" + builder.source_map.to_data_uri_comment unless RUBY_ENGINE == 'opal'
|
|
25
25
|
|
|
26
|
+
ext = builder.output_extension
|
|
27
|
+
|
|
26
28
|
tempfile =
|
|
27
29
|
if debug
|
|
28
|
-
File.new(
|
|
30
|
+
File.new("opal-nodejs-runner.#{ext}", 'w')
|
|
29
31
|
else
|
|
30
|
-
Tempfile.new('opal-system-runner
|
|
32
|
+
Tempfile.new(['opal-system-runner', ".#{ext}"])
|
|
31
33
|
end
|
|
32
34
|
|
|
33
35
|
tempfile.write code
|
data/lib/opal/cli_runners.rb
CHANGED
|
@@ -10,7 +10,8 @@ module Opal
|
|
|
10
10
|
# - `output`: an IO-like object responding to `#write` and `#puts`
|
|
11
11
|
# - `argv`: is the arguments vector coming from the CLI that is being
|
|
12
12
|
# forwarded to the program
|
|
13
|
-
# - `builder`:
|
|
13
|
+
# - `builder`: a proc returning a new instance of Opal::Builder so it
|
|
14
|
+
# can be re-created and pick up the most up-to-date sources
|
|
14
15
|
#
|
|
15
16
|
# Runners can be registered using `#register_runner(name, runner)`.
|
|
16
17
|
#
|
|
@@ -21,7 +22,7 @@ module Opal
|
|
|
21
22
|
@register = {}
|
|
22
23
|
|
|
23
24
|
def self.[](name)
|
|
24
|
-
@register[name.to_sym]
|
|
25
|
+
@register[name.to_sym]&.call
|
|
25
26
|
end
|
|
26
27
|
|
|
27
28
|
# @private
|
|
@@ -44,10 +45,10 @@ module Opal
|
|
|
44
45
|
def self.register_runner(name, runner, path = nil)
|
|
45
46
|
autoload runner, path if path
|
|
46
47
|
|
|
47
|
-
if runner.respond_to?
|
|
48
|
-
self[name] = runner
|
|
48
|
+
if runner.respond_to? :call
|
|
49
|
+
self[name] = -> { runner }
|
|
49
50
|
else
|
|
50
|
-
self[name] = ->
|
|
51
|
+
self[name] = -> { const_get(runner) }
|
|
51
52
|
end
|
|
52
53
|
|
|
53
54
|
nil
|
|
@@ -55,7 +56,7 @@ module Opal
|
|
|
55
56
|
|
|
56
57
|
# Alias a runner name
|
|
57
58
|
def self.alias_runner(new_name, old_name)
|
|
58
|
-
self[new_name.to_sym] = self[old_name.to_sym]
|
|
59
|
+
self[new_name.to_sym] = -> { self[old_name.to_sym] }
|
|
59
60
|
|
|
60
61
|
nil
|
|
61
62
|
end
|
data/lib/opal/compiler.rb
CHANGED
|
@@ -7,6 +7,7 @@ require 'opal/nodes'
|
|
|
7
7
|
require 'opal/eof_content'
|
|
8
8
|
require 'opal/errors'
|
|
9
9
|
require 'opal/magic_comments'
|
|
10
|
+
require 'opal/nodes/closure'
|
|
10
11
|
|
|
11
12
|
module Opal
|
|
12
13
|
# Compile a string of ruby code into javascript.
|
|
@@ -46,6 +47,8 @@ module Opal
|
|
|
46
47
|
# compiler.source_map # => #<SourceMap:>
|
|
47
48
|
#
|
|
48
49
|
class Compiler
|
|
50
|
+
include Nodes::Closure::CompilerSupport
|
|
51
|
+
|
|
49
52
|
# Generated code gets indented with two spaces on each scope
|
|
50
53
|
INDENT = ' '
|
|
51
54
|
|
|
@@ -137,11 +140,23 @@ module Opal
|
|
|
137
140
|
# Prepare the code for future requires
|
|
138
141
|
compiler_option :requirable, default: false, as: :requirable?
|
|
139
142
|
|
|
143
|
+
# @!method load?
|
|
144
|
+
#
|
|
145
|
+
# Instantly load a requirable module
|
|
146
|
+
compiler_option :load, default: false, as: :load?
|
|
147
|
+
|
|
140
148
|
# @!method esm?
|
|
141
149
|
#
|
|
142
|
-
#
|
|
150
|
+
# Encourage ESM semantics, eg. exporting run result
|
|
143
151
|
compiler_option :esm, default: false, as: :esm?
|
|
144
152
|
|
|
153
|
+
# @!method no_export?
|
|
154
|
+
#
|
|
155
|
+
# Don't export this compile, even if ESM mode is enabled. We use
|
|
156
|
+
# this internally in CLI, so that even if ESM output is desired,
|
|
157
|
+
# we would only have one default export.
|
|
158
|
+
compiler_option :no_export, default: false, as: :no_export?
|
|
159
|
+
|
|
145
160
|
# @!method inline_operators?
|
|
146
161
|
#
|
|
147
162
|
# are operators compiled inline
|
|
@@ -154,6 +169,11 @@ module Opal
|
|
|
154
169
|
# Adds source_location for every method definition
|
|
155
170
|
compiler_option :enable_source_location, default: false, as: :enable_source_location?
|
|
156
171
|
|
|
172
|
+
# @!method enable_file_source_embed?
|
|
173
|
+
#
|
|
174
|
+
# Embeds source code along compiled files
|
|
175
|
+
compiler_option :enable_file_source_embed, default: false, as: :enable_file_source_embed?
|
|
176
|
+
|
|
157
177
|
# @!method use_strict?
|
|
158
178
|
#
|
|
159
179
|
# Enables JavaScript's strict mode (i.e., adds 'use strict'; statement)
|
|
@@ -223,6 +243,9 @@ module Opal
|
|
|
223
243
|
# Magic comment flags extracted from the leading comments
|
|
224
244
|
attr_reader :magic_comments
|
|
225
245
|
|
|
246
|
+
# Access the source code currently processed
|
|
247
|
+
attr_reader :source
|
|
248
|
+
|
|
226
249
|
# Set if some rewritter caused a dynamic cache result, meaning it's not
|
|
227
250
|
# fit to be cached
|
|
228
251
|
attr_accessor :dynamic_cache_result
|
|
@@ -558,7 +581,7 @@ module Opal
|
|
|
558
581
|
returns(true_body),
|
|
559
582
|
returns(false_body)
|
|
560
583
|
]
|
|
561
|
-
)
|
|
584
|
+
).tap { |s| s.meta[:returning] = true }
|
|
562
585
|
else
|
|
563
586
|
if sexp.type == :send && sexp.children[1] == :debugger
|
|
564
587
|
# debugger is a statement, so it doesn't return a value
|
data/lib/opal/config.rb
CHANGED
|
@@ -139,6 +139,16 @@ module Opal
|
|
|
139
139
|
# @return [true, false]
|
|
140
140
|
config_option :source_map_enabled, true
|
|
141
141
|
|
|
142
|
+
# Enable source location embedded for methods and procs.
|
|
143
|
+
#
|
|
144
|
+
# @return [true, false]
|
|
145
|
+
config_option :enable_source_location, false, compiler_option: :enable_source_location
|
|
146
|
+
|
|
147
|
+
# Enable embedding source code to be read by applications.
|
|
148
|
+
#
|
|
149
|
+
# @return [true, false]
|
|
150
|
+
config_option :enable_file_source_embed, false, compiler_option: :enable_file_source_embed
|
|
151
|
+
|
|
142
152
|
# A set of stubbed files that will be marked as loaded and skipped during
|
|
143
153
|
# compilation. The value is expected to be mutated but it's ok to replace
|
|
144
154
|
# it.
|
|
@@ -14,13 +14,9 @@ module Opal
|
|
|
14
14
|
handle :ensure_kwargs_are_kwargs
|
|
15
15
|
|
|
16
16
|
def compile
|
|
17
|
-
helper :
|
|
17
|
+
helper :ensure_kwargs
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
line ' $kwargs = $hash2([], {});'
|
|
21
|
-
line '} else if (!$kwargs.$$is_hash) {'
|
|
22
|
-
line " throw Opal.ArgumentError.$new('expected kwargs');"
|
|
23
|
-
line '}'
|
|
19
|
+
push '$kwargs = $ensure_kwargs($kwargs)'
|
|
24
20
|
end
|
|
25
21
|
end
|
|
26
22
|
end
|
|
@@ -21,10 +21,9 @@ module Opal
|
|
|
21
21
|
|
|
22
22
|
add_temp lvar_name
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
line "#{lvar_name} = $kwargs.$$smap[#{key_name.to_s.inspect}];"
|
|
24
|
+
helper :get_kwarg
|
|
25
|
+
|
|
26
|
+
push "#{lvar_name} = $get_kwarg($kwargs, #{key_name.to_s.inspect})"
|
|
28
27
|
end
|
|
29
28
|
end
|
|
30
29
|
end
|
|
@@ -27,9 +27,9 @@ module Opal
|
|
|
27
27
|
|
|
28
28
|
if args_to_keep == 0
|
|
29
29
|
# no post-args, we are free to grab everything
|
|
30
|
-
|
|
30
|
+
push "#{name} = $post_args"
|
|
31
31
|
else
|
|
32
|
-
|
|
32
|
+
push "#{name} = $post_args.splice(0, $post_args.length - #{args_to_keep})"
|
|
33
33
|
end
|
|
34
34
|
end
|
|
35
35
|
end
|
|
@@ -14,10 +14,12 @@ module Opal
|
|
|
14
14
|
def compile
|
|
15
15
|
add_temp '$post_args'
|
|
16
16
|
|
|
17
|
+
helper :slice
|
|
18
|
+
|
|
17
19
|
if offset == 0
|
|
18
|
-
|
|
20
|
+
push "$post_args = $slice.call(arguments)"
|
|
19
21
|
else
|
|
20
|
-
|
|
22
|
+
push "$post_args = $slice.call(arguments, #{offset})"
|
|
21
23
|
end
|
|
22
24
|
end
|
|
23
25
|
end
|
data/lib/opal/nodes/base.rb
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
require 'opal/nodes/helpers'
|
|
4
|
+
require 'opal/nodes/closure'
|
|
4
5
|
|
|
5
6
|
module Opal
|
|
6
7
|
module Nodes
|
|
7
8
|
class Base
|
|
8
9
|
include Helpers
|
|
10
|
+
include Closure::NodeSupport
|
|
9
11
|
|
|
10
12
|
def self.handlers
|
|
11
13
|
@handlers ||= {}
|
|
@@ -126,6 +128,10 @@ module Opal
|
|
|
126
128
|
sexp ? expr(sexp) : 'nil'
|
|
127
129
|
end
|
|
128
130
|
|
|
131
|
+
def expr_or_empty(sexp)
|
|
132
|
+
sexp && sexp.type != :nil ? expr(sexp) : ''
|
|
133
|
+
end
|
|
134
|
+
|
|
129
135
|
def add_local(name)
|
|
130
136
|
scope.add_scope_local name.to_sym
|
|
131
137
|
end
|
|
@@ -211,9 +217,14 @@ module Opal
|
|
|
211
217
|
end
|
|
212
218
|
|
|
213
219
|
def source_location
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
220
|
+
expr = @sexp.loc.expression
|
|
221
|
+
if expr.respond_to? :source_buffer
|
|
222
|
+
file = expr.source_buffer.name
|
|
223
|
+
file = "<internal:#{file}>" if file.start_with?("corelib/")
|
|
224
|
+
file = "<js:#{file}>" if file.end_with?(".js")
|
|
225
|
+
else
|
|
226
|
+
file = "(eval)"
|
|
227
|
+
end
|
|
217
228
|
line = @sexp.loc.line
|
|
218
229
|
"['#{file}', #{line}]"
|
|
219
230
|
end
|
data/lib/opal/nodes/call.rb
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
require 'set'
|
|
4
4
|
require 'pathname'
|
|
5
5
|
require 'opal/nodes/base'
|
|
6
|
-
require 'opal/rewriters/break_finder'
|
|
7
6
|
|
|
8
7
|
module Opal
|
|
9
8
|
module Nodes
|
|
@@ -64,9 +63,7 @@ module Opal
|
|
|
64
63
|
def iter_has_break?
|
|
65
64
|
return false unless iter
|
|
66
65
|
|
|
67
|
-
|
|
68
|
-
finder.process(iter)
|
|
69
|
-
finder.found_break?
|
|
66
|
+
iter.meta[:has_break]
|
|
70
67
|
end
|
|
71
68
|
|
|
72
69
|
# Opal has a runtime helper 'Opal.send_method_name' that assigns
|
|
@@ -99,10 +96,11 @@ module Opal
|
|
|
99
96
|
|
|
100
97
|
def default_compile
|
|
101
98
|
if auto_await?
|
|
102
|
-
push 'await '
|
|
99
|
+
push '(await '
|
|
103
100
|
scope.await_encountered = true
|
|
104
101
|
end
|
|
105
102
|
|
|
103
|
+
push_closure(Closure::SEND) if iter_has_break?
|
|
106
104
|
if invoke_using_refinement?
|
|
107
105
|
compile_using_refined_send
|
|
108
106
|
elsif invoke_using_send?
|
|
@@ -110,8 +108,11 @@ module Opal
|
|
|
110
108
|
else
|
|
111
109
|
compile_simple_call_chain
|
|
112
110
|
end
|
|
111
|
+
pop_closure if iter_has_break?
|
|
113
112
|
|
|
114
|
-
|
|
113
|
+
if auto_await?
|
|
114
|
+
push ')'
|
|
115
|
+
end
|
|
115
116
|
end
|
|
116
117
|
|
|
117
118
|
# Compiles method call using `Opal.send`
|
|
@@ -184,14 +185,6 @@ module Opal
|
|
|
184
185
|
push expr(s(:array, *refinements)), ', '
|
|
185
186
|
end
|
|
186
187
|
|
|
187
|
-
def compile_break_catcher
|
|
188
|
-
if iter_has_break?
|
|
189
|
-
unshift 'return '
|
|
190
|
-
unshift '(function(){var $brk = Opal.new_brk(); try {'
|
|
191
|
-
line '} catch (err) { if (err === $brk) { return err.$v } else { throw err } }})()'
|
|
192
|
-
end
|
|
193
|
-
end
|
|
194
|
-
|
|
195
188
|
def compile_simple_call_chain
|
|
196
189
|
push recv(receiver_sexp), method_jsid, '(', expr(arglist), ')'
|
|
197
190
|
end
|
|
@@ -398,6 +391,9 @@ module Opal
|
|
|
398
391
|
# This can be refactored in terms of binding, but it would need 'corelib/binding'
|
|
399
392
|
# to be required in existing code.
|
|
400
393
|
add_special :eval do |compile_default|
|
|
394
|
+
# Catch the return throw coming from eval
|
|
395
|
+
thrower(:eval_return)
|
|
396
|
+
|
|
401
397
|
next compile_default.call if arglist.children.length != 1 || ![s(:self), nil].include?(recvr)
|
|
402
398
|
|
|
403
399
|
scope.nesting
|
data/lib/opal/nodes/class.rb
CHANGED