myco 0.1.6 → 0.1.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/myco/bootstrap/component.rb +2 -0
- data/lib/myco/bootstrap/evaluator.rb +58 -0
- data/lib/myco/bootstrap/instance.rb +1 -1
- data/lib/myco/bootstrap/meme.rb +4 -9
- data/lib/myco/bootstrap.my +1 -1
- data/lib/myco/bootstrap.my.rb +1 -1
- data/lib/myco/code_loader.rb +6 -1
- data/lib/myco/code_tools/AST/ArgumentAssembly.my +8 -12
- data/lib/myco/code_tools/AST/ArgumentAssembly.my.rb +12 -9
- data/lib/myco/code_tools/AST/ArrayAssembly.my +2 -3
- data/lib/myco/code_tools/AST/ArrayAssembly.my.rb +2 -5
- data/lib/myco/code_tools/AST/Block.my +4 -4
- data/lib/myco/code_tools/AST/Block.my.rb +3 -7
- data/lib/myco/code_tools/AST/BlockArgument.my +4 -5
- data/lib/myco/code_tools/AST/BlockArgument.my.rb +2 -5
- data/lib/myco/code_tools/AST/BlockLiteral.my +3 -4
- data/lib/myco/code_tools/AST/BlockLiteral.my.rb +6 -6
- data/lib/myco/code_tools/AST/BlockParameter.my +4 -11
- data/lib/myco/code_tools/AST/BlockParameter.my.rb +4 -13
- data/lib/myco/code_tools/AST/BranchOperator.my +2 -3
- data/lib/myco/code_tools/AST/BranchOperator.my.rb +4 -9
- data/lib/myco/code_tools/AST/ConstantAccess.my +11 -8
- data/lib/myco/code_tools/AST/ConstantAccess.my.rb +16 -12
- data/lib/myco/code_tools/AST/ConstantAssignment.my +13 -5
- data/lib/myco/code_tools/AST/ConstantAssignment.my.rb +16 -11
- data/lib/myco/code_tools/AST/ConstantDefine.my +2 -3
- data/lib/myco/code_tools/AST/ConstantDefine.my.rb +3 -7
- data/lib/myco/code_tools/AST/DeclareCategory.my +4 -14
- data/lib/myco/code_tools/AST/DeclareCategory.my.rb +20 -36
- data/lib/myco/code_tools/AST/DeclareDecorator.my +2 -3
- data/lib/myco/code_tools/AST/DeclareDecorator.my.rb +3 -7
- data/lib/myco/code_tools/AST/DeclareExtension.my +22 -0
- data/lib/myco/code_tools/AST/DeclareExtension.my.rb +19 -0
- data/lib/myco/code_tools/AST/DeclareFile.my +4 -15
- data/lib/myco/code_tools/AST/DeclareFile.my.rb +34 -50
- data/lib/myco/code_tools/AST/DeclareMeme.my +5 -7
- data/lib/myco/code_tools/AST/DeclareMeme.my.rb +8 -17
- data/lib/myco/code_tools/AST/DeclareObject.my +6 -18
- data/lib/myco/code_tools/AST/DeclareObject.my.rb +41 -59
- data/lib/myco/code_tools/AST/DeclareString.my +2 -3
- data/lib/myco/code_tools/AST/DeclareString.my.rb +3 -7
- data/lib/myco/code_tools/AST/{MycoModuleScope.my → DeclaredScope.my} +15 -16
- data/lib/myco/code_tools/AST/{MycoModuleScope.my.rb → DeclaredScope.my.rb} +15 -20
- data/lib/myco/code_tools/AST/Invoke.my +8 -8
- data/lib/myco/code_tools/AST/Invoke.my.rb +13 -21
- data/lib/myco/code_tools/AST/InvokeMethod.my +2 -3
- data/lib/myco/code_tools/AST/InvokeMethod.my.rb +4 -9
- data/lib/myco/code_tools/AST/KeywordAssembly.my +3 -4
- data/lib/myco/code_tools/AST/KeywordAssembly.my.rb +2 -5
- data/lib/myco/code_tools/AST/KeywordOptionalParameter.my +16 -0
- data/lib/myco/code_tools/AST/KeywordOptionalParameter.my.rb +14 -0
- data/lib/myco/code_tools/AST/KeywordRequiredParameter.my +16 -0
- data/lib/myco/code_tools/AST/KeywordRequiredParameter.my.rb +13 -0
- data/lib/myco/code_tools/AST/KeywordRestParameter.my +16 -0
- data/lib/myco/code_tools/AST/KeywordRestParameter.my.rb +13 -0
- data/lib/myco/code_tools/AST/LocalVariableAccessAmbiguous.my +2 -3
- data/lib/myco/code_tools/AST/LocalVariableAccessAmbiguous.my.rb +2 -5
- data/lib/myco/code_tools/AST/LocalVariableAssignment.my +3 -3
- data/lib/myco/code_tools/AST/LocalVariableAssignment.my.rb +3 -7
- data/lib/myco/code_tools/AST/Node.my +32 -2
- data/lib/myco/code_tools/AST/Node.my.rb +34 -1
- data/lib/myco/code_tools/AST/NumericLiteral.my +15 -0
- data/lib/myco/code_tools/AST/NumericLiteral.my.rb +12 -0
- data/lib/myco/code_tools/AST/OptionalParameter.my +24 -0
- data/lib/myco/code_tools/AST/OptionalParameter.my.rb +19 -0
- data/lib/myco/code_tools/AST/ParameterAssembly.my +60 -103
- data/lib/myco/code_tools/AST/ParameterAssembly.my.rb +60 -121
- data/lib/myco/code_tools/AST/PipeOperator.my +2 -3
- data/lib/myco/code_tools/AST/PipeOperator.my.rb +3 -7
- data/lib/myco/code_tools/AST/Quest.my +8 -10
- data/lib/myco/code_tools/AST/Quest.my.rb +9 -13
- data/lib/myco/code_tools/AST/RequiredParameter.my +12 -0
- data/lib/myco/code_tools/AST/RequiredParameter.my.rb +10 -0
- data/lib/myco/code_tools/AST/RestParameter.my +12 -0
- data/lib/myco/code_tools/AST/RestParameter.my.rb +10 -0
- data/lib/myco/code_tools/AST/Script.my +4 -4
- data/lib/myco/code_tools/AST/Script.my.rb +3 -7
- data/lib/myco/code_tools/AST/Sequence.my +2 -3
- data/lib/myco/code_tools/AST/Sequence.my.rb +2 -5
- data/lib/myco/code_tools/AST/SplatValue.my +3 -4
- data/lib/myco/code_tools/AST/SplatValue.my.rb +2 -5
- data/lib/myco/code_tools/AST/{DynamicString.my → StringCompose.my} +3 -4
- data/lib/myco/code_tools/AST/{DynamicString.my.rb → StringCompose.my.rb} +4 -7
- data/lib/myco/code_tools/AST/StringLiteral.my +2 -3
- data/lib/myco/code_tools/AST/StringLiteral.my.rb +2 -5
- data/lib/myco/code_tools/AST/{DynamicSymbol.my → SymbolCompose.my} +3 -4
- data/lib/myco/code_tools/AST/{DynamicSymbol.my.rb → SymbolCompose.my.rb} +4 -7
- data/lib/myco/code_tools/AST/SymbolLiteral.my +2 -3
- data/lib/myco/code_tools/AST/SymbolLiteral.my.rb +2 -5
- data/lib/myco/code_tools/AST/ToRuby.my +40 -57
- data/lib/myco/code_tools/AST/ToRuby.my.rb +43 -52
- data/lib/myco/code_tools/AST/misc.my +19 -24
- data/lib/myco/code_tools/AST/misc.my.rb +18 -23
- data/lib/myco/code_tools/AST.my +17 -8
- data/lib/myco/code_tools/AST.my.rb +14 -7
- data/lib/myco/code_tools/Parser.my +1 -1
- data/lib/myco/code_tools/parser/MycoBuilder.my +3 -3
- data/lib/myco/code_tools/parser/MycoBuilder.my.rb +3 -3
- data/lib/myco/code_tools/parser/MycoGrammar.my +67 -74
- data/lib/myco/code_tools/parser/MycoGrammar.my.rb +211 -316
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/BytecodeHelpers.my +3 -3
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/BytecodeHelpers.my.rb +2 -2
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/BytecodeInstructions.my +9 -9
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/BytecodeInstructions.my.rb +9 -9
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/BytecodeParser.my +2 -2
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/BytecodeParser.my.rb +4 -1
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/Grammar.my +2 -3
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/Grammar.my.rb +2 -3
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/Machine.my +1 -1
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/Machine.my.rb +1 -1
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/Processor.my +5 -5
- data/lib/myco/code_tools/parser/pegleromyces/lib/pegleromyces/Processor.my.rb +5 -5
- data/lib/myco/command.my +1 -1
- data/lib/myco/command.my.rb +1 -1
- data/lib/myco/core/BasicDecorators.my +10 -8
- data/lib/myco/core/BasicDecorators.my.rb +7 -7
- data/lib/myco/core/BasicObject.my +38 -7
- data/lib/myco/core/BasicObject.my.rb +23 -4
- data/lib/myco/tools/BasicCommand.my +1 -1
- data/lib/myco/tools/BasicCommand.my.rb +1 -1
- data/lib/myco/version.rb +1 -1
- data/lib/myco.rb +3 -0
- metadata +41 -26
- data/lib/myco/code_tools/AST/ConstantReopen.my +0 -29
- data/lib/myco/code_tools/AST/ConstantReopen.my.rb +0 -35
@@ -1,27 +1,17 @@
|
|
1
1
|
|
2
2
|
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
|
-
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::
|
3
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::DeclaredScope = ::Myco::Component.new([
|
4
4
|
::Myco.find_constant(:CodeTools)::Compiler::LocalVariables,
|
5
5
|
::Myco.find_constant(:Node)
|
6
6
|
], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
7
7
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
8
8
|
declare_meme(:name, [[:var, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
9
9
|
declare_meme(:body, [[:var, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
10
|
+
declare_meme(:scope_method, [[:var, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
10
11
|
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
11
12
|
self.pos(g)
|
12
13
|
g.state.scope.nest_scope(self)
|
13
|
-
|
14
|
-
g,
|
15
|
-
:__myco_module_init__,
|
16
|
-
true
|
17
|
-
)
|
18
|
-
)}
|
19
|
-
declare_meme(:attach_and_call, [], nil, ::Myco.cscope.dup) { |g, arg_name, scoped=false, pass_block=false| (
|
20
|
-
self.__send__(
|
21
|
-
:name=,
|
22
|
-
:MycoModuleScope
|
23
|
-
)
|
24
|
-
name = ::Myco.branch_op(:"||", self.name) {arg_name}
|
14
|
+
name = :__declaration__
|
25
15
|
meth = self.new_generator(
|
26
16
|
g,
|
27
17
|
name
|
@@ -31,12 +21,18 @@
|
|
31
21
|
:for_module_body=,
|
32
22
|
true
|
33
23
|
)
|
34
|
-
|
35
|
-
|
36
|
-
meth.add_scope
|
37
|
-
)}
|
24
|
+
meth.push_self
|
25
|
+
meth.add_scope
|
38
26
|
meth.state.push_name(name.to_sym)
|
39
|
-
self.
|
27
|
+
::Myco.branch_op(:"&&", self.scope_method) {(
|
28
|
+
meth.push_scope
|
29
|
+
meth.send(
|
30
|
+
self.scope_method,
|
31
|
+
0
|
32
|
+
)
|
33
|
+
meth.pop
|
34
|
+
)}
|
35
|
+
self.body.bytecode(meth)
|
40
36
|
meth.state.pop_name
|
41
37
|
meth.ret
|
42
38
|
meth.close
|
@@ -59,7 +55,6 @@
|
|
59
55
|
)
|
60
56
|
meth
|
61
57
|
)}
|
62
|
-
declare_meme(:body_bytecode, [], nil, ::Myco.cscope.dup) { |g| (self.body.bytecode(g))}
|
63
58
|
declare_meme(:nest_scope, [], nil, ::Myco.cscope.dup) { |scope| (scope.__send__(
|
64
59
|
:parent=,
|
65
60
|
self
|
@@ -79,4 +74,4 @@
|
|
79
74
|
)}
|
80
75
|
)}
|
81
76
|
)}}
|
82
|
-
.tap { |__c__| __c__.__name__ = :
|
77
|
+
.tap { |__c__| __c__.__name__ = :DeclaredScope })})}}.instance
|
@@ -2,22 +2,22 @@
|
|
2
2
|
CodeTools::AST << {
|
3
3
|
|
4
4
|
Invoke < Node {
|
5
|
-
|
6
|
-
|
7
|
-
Form: [:invoke, :receiver, :name, :arguments, :block]
|
5
|
+
node_type invoke
|
6
|
+
field receiver, field name, field arguments, field block
|
8
7
|
|
9
8
|
bytecode: |g| pos(g); implementation.bytecode(g)
|
10
9
|
|
11
10
|
implementation: {
|
11
|
+
use_args = self.arguments
|
12
|
+
|
12
13
|
# TODO: error if passing both block argument and block literal
|
13
14
|
# Currently, this fails silently and ignores the block argument
|
14
|
-
# TODO: don't change AST state from here
|
15
15
|
self.block && (
|
16
|
-
|
17
|
-
|
16
|
+
use_args = (use_args && use_args.dup) || ArgumentAssembly.new(line:self.line, body:[])
|
17
|
+
use_args.block = self.block
|
18
18
|
)
|
19
19
|
|
20
|
-
self.receiver.nil? &&
|
20
|
+
self.receiver.nil? && use_args.nil? &? (
|
21
21
|
LocalVariableAccessAmbiguous.new(
|
22
22
|
line: self.line
|
23
23
|
name: self.name
|
@@ -27,7 +27,7 @@ CodeTools::AST << {
|
|
27
27
|
line: self.line
|
28
28
|
receiver: self.receiver || Self.new(line:self.line)
|
29
29
|
name: self.name
|
30
|
-
arguments:
|
30
|
+
arguments: use_args || ArgumentAssembly.new(line:self.line, body:[])
|
31
31
|
)
|
32
32
|
)
|
33
33
|
}
|
@@ -2,43 +2,35 @@
|
|
2
2
|
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
3
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::Invoke = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
4
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
-
declare_meme(:
|
6
|
-
declare_meme(:
|
7
|
-
declare_meme(:
|
8
|
-
declare_meme(:
|
9
|
-
::Myco.cscope.
|
10
|
-
:invoke,
|
11
|
-
:receiver,
|
12
|
-
:name,
|
13
|
-
:arguments,
|
14
|
-
:block
|
15
|
-
])
|
5
|
+
declare_meme(:invoke, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:receiver, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
8
|
+
declare_meme(:arguments, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
9
|
+
declare_meme(:block, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
16
10
|
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
17
11
|
self.pos(g)
|
18
12
|
self.implementation.bytecode(g)
|
19
13
|
)}
|
20
14
|
declare_meme(:implementation, [], nil, ::Myco.cscope.dup) { |*| (
|
15
|
+
use_args = self.arguments
|
21
16
|
::Myco.branch_op(:"&&", self.block) {(
|
22
|
-
|
23
|
-
:
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
})}
|
28
|
-
)
|
29
|
-
self.arguments.__send__(
|
17
|
+
use_args = ::Myco.branch_op(:"||", ::Myco.branch_op(:"&&", use_args) {use_args.dup}) {::Myco.find_constant(:ArgumentAssembly).new({
|
18
|
+
:line => self.line,
|
19
|
+
:body => []
|
20
|
+
})}
|
21
|
+
use_args.__send__(
|
30
22
|
:block=,
|
31
23
|
self.block
|
32
24
|
)
|
33
25
|
)}
|
34
|
-
::Myco.branch_op(:"??", ::Myco.branch_op(:"&?", ::Myco.branch_op(:"&&", self.receiver.__send__(:nil?)) {
|
26
|
+
::Myco.branch_op(:"??", ::Myco.branch_op(:"&?", ::Myco.branch_op(:"&&", self.receiver.__send__(:nil?)) {use_args.__send__(:nil?)}) {::Myco.find_constant(:LocalVariableAccessAmbiguous).new({
|
35
27
|
:line => self.line,
|
36
28
|
:name => self.name
|
37
29
|
})}) {::Myco.find_constant(:InvokeMethod).new({
|
38
30
|
:line => self.line,
|
39
31
|
:receiver => ::Myco.branch_op(:"||", self.receiver) {::Myco.find_constant(:Self).new({:line => self.line})},
|
40
32
|
:name => self.name,
|
41
|
-
:arguments => ::Myco.branch_op(:"||",
|
33
|
+
:arguments => ::Myco.branch_op(:"||", use_args) {::Myco.find_constant(:ArgumentAssembly).new({
|
42
34
|
:line => self.line,
|
43
35
|
:body => []
|
44
36
|
})}
|
@@ -2,15 +2,10 @@
|
|
2
2
|
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
3
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::InvokeMethod = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
4
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
-
declare_meme(:
|
6
|
-
declare_meme(:
|
7
|
-
declare_meme(:
|
8
|
-
::Myco.cscope.
|
9
|
-
:call,
|
10
|
-
:receiver,
|
11
|
-
:name,
|
12
|
-
:arguments
|
13
|
-
])
|
5
|
+
declare_meme(:call, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:receiver, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
8
|
+
declare_meme(:arguments, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
14
9
|
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
15
10
|
self.receiver.bytecode(g)
|
16
11
|
self.arguments.bytecode(g)
|
@@ -2,15 +2,14 @@
|
|
2
2
|
CodeTools::AST << {
|
3
3
|
|
4
4
|
KeywordAssembly < Node {
|
5
|
-
|
6
|
-
|
7
|
-
Form: [:hash, :body]
|
5
|
+
node_type hash
|
6
|
+
field body
|
8
7
|
|
9
8
|
bytecode: |g| {
|
10
9
|
pos(g)
|
11
10
|
|
12
11
|
g.push_cpath_top
|
13
|
-
g.find_const(:
|
12
|
+
g.find_const(:Hash)
|
14
13
|
g.push(self.body.size / 2)
|
15
14
|
g.send(:new_from_literal, 1)
|
16
15
|
|
@@ -2,11 +2,8 @@
|
|
2
2
|
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
3
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::KeywordAssembly = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
4
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
-
declare_meme(:
|
6
|
-
::Myco.cscope.
|
7
|
-
:hash,
|
8
|
-
:body
|
9
|
-
])
|
5
|
+
declare_meme(:hash, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:body, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
10
7
|
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
11
8
|
self.pos(g)
|
12
9
|
g.push_cpath_top
|
@@ -0,0 +1,16 @@
|
|
1
|
+
|
2
|
+
CodeTools::AST << {
|
3
|
+
|
4
|
+
KeywordOptionalParameter < Node {
|
5
|
+
node_type kwoptprm
|
6
|
+
field name, field value
|
7
|
+
|
8
|
+
map_local: |scope| {
|
9
|
+
scope.new_local(:__myco_keywords_value__)
|
10
|
+
scope.new_local(self.name)
|
11
|
+
}
|
12
|
+
|
13
|
+
bytecode: |g| { } # TODO: move ParameterAssembly logic to this method
|
14
|
+
}
|
15
|
+
|
16
|
+
}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
|
2
|
+
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::KeywordOptionalParameter = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
+
declare_meme(:kwoptprm, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:value, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
8
|
+
declare_meme(:map_local, [], nil, ::Myco.cscope.dup) { |scope| (
|
9
|
+
scope.new_local(:__myco_keywords_value__)
|
10
|
+
scope.new_local(self.name)
|
11
|
+
)}
|
12
|
+
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| nil}
|
13
|
+
)}}
|
14
|
+
.tap { |__c__| __c__.__name__ = :KeywordOptionalParameter })})}}.instance
|
@@ -0,0 +1,16 @@
|
|
1
|
+
|
2
|
+
CodeTools::AST << {
|
3
|
+
|
4
|
+
KeywordRequiredParameter < Node {
|
5
|
+
node_type kwreqprm
|
6
|
+
field name
|
7
|
+
|
8
|
+
map_local: |scope| {
|
9
|
+
scope.new_local(:__myco_keywords_value__)
|
10
|
+
scope.new_local(self.name)
|
11
|
+
}
|
12
|
+
|
13
|
+
bytecode: |g| { } # TODO: move ParameterAssembly logic to this method
|
14
|
+
}
|
15
|
+
|
16
|
+
}
|
@@ -0,0 +1,13 @@
|
|
1
|
+
|
2
|
+
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::KeywordRequiredParameter = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
+
declare_meme(:kwreqprm, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:map_local, [], nil, ::Myco.cscope.dup) { |scope| (
|
8
|
+
scope.new_local(:__myco_keywords_value__)
|
9
|
+
scope.new_local(self.name)
|
10
|
+
)}
|
11
|
+
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| nil}
|
12
|
+
)}}
|
13
|
+
.tap { |__c__| __c__.__name__ = :KeywordRequiredParameter })})}}.instance
|
@@ -0,0 +1,16 @@
|
|
1
|
+
|
2
|
+
CodeTools::AST << {
|
3
|
+
|
4
|
+
KeywordRestParameter < Node {
|
5
|
+
node_type kwrestprm
|
6
|
+
field name
|
7
|
+
|
8
|
+
map_local: |scope| {
|
9
|
+
scope.new_local(:__myco_keywords_value__)
|
10
|
+
scope.new_local(self.name)
|
11
|
+
}
|
12
|
+
|
13
|
+
bytecode: |g| { } # TODO: move ParameterAssembly logic to this method
|
14
|
+
}
|
15
|
+
|
16
|
+
}
|
@@ -0,0 +1,13 @@
|
|
1
|
+
|
2
|
+
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::KeywordRestParameter = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
+
declare_meme(:kwrestprm, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:map_local, [], nil, ::Myco.cscope.dup) { |scope| (
|
8
|
+
scope.new_local(:__myco_keywords_value__)
|
9
|
+
scope.new_local(self.name)
|
10
|
+
)}
|
11
|
+
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| nil}
|
12
|
+
)}}
|
13
|
+
.tap { |__c__| __c__.__name__ = :KeywordRestParameter })})}}.instance
|
@@ -2,11 +2,8 @@
|
|
2
2
|
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
3
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::LocalVariableAccessAmbiguous = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
4
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
-
declare_meme(:
|
6
|
-
::Myco.cscope.
|
7
|
-
:lambig,
|
8
|
-
:name
|
9
|
-
])
|
5
|
+
declare_meme(:lambig, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
10
7
|
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
11
8
|
self.pos(g)
|
12
9
|
local = g.state.scope.search_local(self.name)
|
@@ -2,10 +2,10 @@
|
|
2
2
|
CodeTools::AST << {
|
3
3
|
|
4
4
|
LocalVariableAssignment < Node {
|
5
|
-
|
6
|
-
|
5
|
+
node_type lasgn
|
6
|
+
field name, field value
|
7
7
|
|
8
|
-
|
8
|
+
var variable # TODO: remove
|
9
9
|
|
10
10
|
bytecode: |g| {
|
11
11
|
var = g.state.scope.assign_local_reference(self)
|
@@ -2,14 +2,10 @@
|
|
2
2
|
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
3
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::LocalVariableAssignment = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
4
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
-
declare_meme(:
|
6
|
-
declare_meme(:
|
5
|
+
declare_meme(:lasgn, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:value, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
8
|
declare_meme(:variable, [[:var, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
8
|
-
::Myco.cscope.for_method_definition::Form = ([
|
9
|
-
:lasgn,
|
10
|
-
:name,
|
11
|
-
:value
|
12
|
-
])
|
13
9
|
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
14
10
|
var = g.state.scope.assign_local_reference(self)
|
15
11
|
::Myco.branch_op(:"&&", self.value) {self.value.bytecode(g)}
|
@@ -8,7 +8,7 @@ CodeTools::AST << {
|
|
8
8
|
|
9
9
|
new_block_generator: |g, parameters| {
|
10
10
|
blk = g.class.new
|
11
|
-
blk.name = g.state.name || :
|
11
|
+
blk.name = g.state.name || :__block__
|
12
12
|
blk.file = g.file
|
13
13
|
blk.for_block = true
|
14
14
|
|
@@ -26,6 +26,36 @@ CodeTools::AST << {
|
|
26
26
|
|
27
27
|
meth
|
28
28
|
}
|
29
|
+
|
30
|
+
static var node_type: null
|
31
|
+
static var fields: [] # TODO: should be "static const"
|
32
|
+
|
33
|
+
node_type: self.class.node_type
|
34
|
+
fields: self.class.fields
|
35
|
+
representation: [
|
36
|
+
self.node_type, self.line, *self.fields.map |name| {
|
37
|
+
value = __send__(name)
|
38
|
+
value.?map |value| { value.?representation ?? value }
|
39
|
+
?? value.?representation
|
40
|
+
?? value
|
41
|
+
}
|
42
|
+
]
|
43
|
+
|
44
|
+
[decorators]
|
45
|
+
|
46
|
+
# TODO: should be "const", not "var"
|
47
|
+
var node_type: Decorator {
|
48
|
+
apply: |meme| meme.target.node_type = meme.name
|
49
|
+
[transforms]
|
50
|
+
expose: false
|
51
|
+
}
|
52
|
+
|
53
|
+
# TODO: should be "const", not "var"
|
54
|
+
var field: Decorator {
|
55
|
+
apply: |meme| meme.target.fields.push(meme.name)
|
56
|
+
[transforms]
|
57
|
+
var: true
|
58
|
+
}
|
29
59
|
}
|
30
60
|
|
31
61
|
# TODO: move this out of Node.my ?
|
@@ -33,7 +63,7 @@ CodeTools::AST << {
|
|
33
63
|
var scope
|
34
64
|
|
35
65
|
# TODO: decouple rubinius-compiler from rubinius-ast and remove this hack
|
36
|
-
|
66
|
+
static new: |scope| {
|
37
67
|
obj = allocate
|
38
68
|
obj.scope = scope
|
39
69
|
obj
|
@@ -35,12 +35,45 @@
|
|
35
35
|
::Myco.branch_op(:"&&", parameters) {parameters.generator_setup(meth)}
|
36
36
|
meth
|
37
37
|
)}
|
38
|
+
declare_meme(:node_type, [
|
39
|
+
[:var, []],
|
40
|
+
[:static, []]
|
41
|
+
], nil, ::Myco.cscope.dup) { |*| (nil)}
|
42
|
+
declare_meme(:fields, [
|
43
|
+
[:var, []],
|
44
|
+
[:static, []]
|
45
|
+
], nil, ::Myco.cscope.dup) { |*| ([])}
|
46
|
+
declare_meme(:node_type, [], nil, ::Myco.cscope.dup) { |*| (self.__send__(:class).node_type)}
|
47
|
+
declare_meme(:fields, [], nil, ::Myco.cscope.dup) { |*| (self.__send__(:class).fields)}
|
48
|
+
declare_meme(:representation, [], nil, ::Myco.cscope.dup) { |*| ([
|
49
|
+
self.node_type,
|
50
|
+
self.line,
|
51
|
+
*self.fields.map { |name| (
|
52
|
+
value = self.__send__(name)
|
53
|
+
::Myco.branch_op(:"??", ::Myco.branch_op(:"??", (value.respond_to?(:map).false? ? ::Myco::Void : value.map { |value| (::Myco.branch_op(:"??", (value.respond_to?(:representation).false? ? ::Myco::Void : value.representation)) {value})})) {(value.respond_to?(:representation).false? ? ::Myco::Void : value.representation)}) {value}
|
54
|
+
)}
|
55
|
+
])}
|
56
|
+
__category__(:decorators).component_eval {(
|
57
|
+
declare_meme(:node_type, [[:var, []]], nil, ::Myco.cscope.dup) { |*| (::Myco::Component.new([::Myco.find_constant(:Decorator)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
58
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
59
|
+
declare_meme(:apply, [], nil, ::Myco.cscope.dup) { |meme| (meme.target.__send__(
|
60
|
+
:node_type=,
|
61
|
+
meme.name
|
62
|
+
))}
|
63
|
+
__category__(:transforms).component_eval {(declare_meme(:expose, [], nil, ::Myco.cscope.dup) { |*| (false)})}
|
64
|
+
)}}.instance)}
|
65
|
+
declare_meme(:field, [[:var, []]], nil, ::Myco.cscope.dup) { |*| (::Myco::Component.new([::Myco.find_constant(:Decorator)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
66
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
67
|
+
declare_meme(:apply, [], nil, ::Myco.cscope.dup) { |meme| (meme.target.fields.push(meme.name))}
|
68
|
+
__category__(:transforms).component_eval {(declare_meme(:var, [], nil, ::Myco.cscope.dup) { |*| (true)})}
|
69
|
+
)}}.instance)}
|
70
|
+
)}
|
38
71
|
)}}
|
39
72
|
.tap { |__c__| __c__.__name__ = :Node }
|
40
73
|
::Myco.cscope.for_method_definition::State = ::Myco::Component.new([::Myco.find_constant(:BasicObject)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
41
74
|
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
42
75
|
declare_meme(:scope, [[:var, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
43
|
-
declare_meme(:new, [[:
|
76
|
+
declare_meme(:new, [[:static, []]], nil, ::Myco.cscope.dup) { |scope| (
|
44
77
|
obj = self.allocate
|
45
78
|
obj.__send__(
|
46
79
|
:scope=,
|
@@ -0,0 +1,12 @@
|
|
1
|
+
|
2
|
+
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::NumericLiteral = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
+
declare_meme(:numeric, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:value, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
8
|
+
self.pos(g)
|
9
|
+
g.push_literal(self.value)
|
10
|
+
)}
|
11
|
+
)}}
|
12
|
+
.tap { |__c__| __c__.__name__ = :NumericLiteral })})}}.instance
|
@@ -0,0 +1,24 @@
|
|
1
|
+
|
2
|
+
CodeTools::AST << {
|
3
|
+
|
4
|
+
OptionalParameter < Node {
|
5
|
+
node_type optprm
|
6
|
+
field name, field value
|
7
|
+
|
8
|
+
map_local: |scope| scope.new_local(self.name)
|
9
|
+
|
10
|
+
bytecode: |g| {
|
11
|
+
done_label = g.new_label
|
12
|
+
|
13
|
+
g.state.scope.search_local(self.name).get_bytecode(g)
|
14
|
+
g.goto_if_not_undefined(done_label)
|
15
|
+
|
16
|
+
self.value.bytecode(g)
|
17
|
+
g.state.scope.search_local(self.name).set_bytecode(g)
|
18
|
+
g.pop
|
19
|
+
|
20
|
+
done_label.set!
|
21
|
+
}
|
22
|
+
}
|
23
|
+
|
24
|
+
}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
|
2
|
+
::Myco::Component.new([::Myco::FileToplevel], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
3
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(::Myco.find_constant(:CodeTools)::AST.component_eval {(::Myco.cscope.for_method_definition::OptionalParameter = ::Myco::Component.new([::Myco.find_constant(:Node)], ::Myco.cscope.for_method_definition, __FILE__, __LINE__)
|
4
|
+
.tap { |__c__| __c__.__last__ = __c__.component_eval {(
|
5
|
+
declare_meme(:optprm, [[:node_type, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
6
|
+
declare_meme(:name, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
7
|
+
declare_meme(:value, [[:field, []]], nil, ::Myco.cscope.dup) { |*| nil}
|
8
|
+
declare_meme(:map_local, [], nil, ::Myco.cscope.dup) { |scope| (scope.new_local(self.name))}
|
9
|
+
declare_meme(:bytecode, [], nil, ::Myco.cscope.dup) { |g| (
|
10
|
+
done_label = g.new_label
|
11
|
+
g.state.scope.search_local(self.name).get_bytecode(g)
|
12
|
+
g.goto_if_not_undefined(done_label)
|
13
|
+
self.value.bytecode(g)
|
14
|
+
g.state.scope.search_local(self.name).set_bytecode(g)
|
15
|
+
g.pop
|
16
|
+
done_label.__send__(:set!)
|
17
|
+
)}
|
18
|
+
)}}
|
19
|
+
.tap { |__c__| __c__.__name__ = :OptionalParameter })})}}.instance
|