rubinius-compiler 1.1.2 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rubinius/compiler/compiled_file.rb +2 -1
  3. data/lib/rubinius/compiler/compiler.rb +1 -1
  4. data/lib/rubinius/compiler/evaluator.rb +1 -1
  5. data/lib/rubinius/compiler/generator.rb +10 -2
  6. data/lib/rubinius/compiler/generator_methods.rb +272 -188
  7. data/lib/rubinius/compiler/locals.rb +1 -1
  8. data/lib/rubinius/compiler/opcodes.rb +100 -94
  9. data/lib/rubinius/compiler/printers.rb +1 -1
  10. data/lib/rubinius/compiler/runtime.rb +1 -1
  11. data/lib/rubinius/compiler/stages.rb +6 -6
  12. data/lib/rubinius/compiler/version.rb +2 -2
  13. data/rubinius-compiler.gemspec +1 -2
  14. metadata +2 -2
data/lib/rubinius/compiler/locals.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: us-ascii -*-
2
2
 
3
- module Rubinius::ToolSets.current::ToolSet
3
+ module CodeTools
4
4
  class Compiler
5
5
  module LocalVariables
6
6
  def variables
data/lib/rubinius/compiler/opcodes.rb CHANGED
@@ -19,132 +19,138 @@ module Rubinius
19
19
  opcode 8, :goto, :stack => [0, 0], :args => [:location], :control_flow => :branch
20
20
  opcode 9, :goto_if_false, :stack => [1, 0], :args => [:location], :control_flow => :branch
21
21
  opcode 10, :goto_if_true, :stack => [1, 0], :args => [:location], :control_flow => :branch
22
- opcode 11, :ret, :stack => [1, 1], :args => [], :control_flow => :return
22
+ opcode 11, :goto_if_nil, :stack => [1, 0], :args => [:location], :control_flow => :branch
23
+ opcode 12, :goto_if_not_nil, :stack => [1, 0], :args => [:location], :control_flow => :branch
24
+ opcode 13, :goto_if_undefined, :stack => [1, 0], :args => [:location], :control_flow => :branch
25
+ opcode 14, :goto_if_not_undefined, :stack => [1, 0], :args => [:location], :control_flow => :branch
26
+ opcode 15, :goto_if_equal, :stack => [2, 0], :args => [:location], :control_flow => :branch
27
+ opcode 16, :goto_if_not_equal, :stack => [2, 0], :args => [:location], :control_flow => :branch
28
+ opcode 17, :ret, :stack => [1, 1], :args => [], :control_flow => :return
23
29
 
24
30
  # Stack manipulations
25
- opcode 12, :swap_stack, :stack => [2, 2], :args => [], :control_flow => :next
26
- opcode 13, :dup_top, :stack => [1, 2], :args => [], :control_flow => :next
27
- opcode 14, :dup_many, :stack => [[0,1], [0, 1, 2]],:args => [:count], :control_flow => :next
28
- opcode 15, :pop, :stack => [1, 0], :args => [], :control_flow => :next
29
- opcode 16, :pop_many, :stack => [[0,1], 0], :args => [:count], :control_flow => :next
30
- opcode 17, :rotate, :stack => [[0,1], [0, 1, 1]],:args => [:count], :control_flow => :next
31
- opcode 18, :move_down, :stack => [[0,1], [0, 1, 1]],:args => [:positions], :control_flow => :next
31
+ opcode 18, :swap_stack, :stack => [2, 2], :args => [], :control_flow => :next
32
+ opcode 19, :dup_top, :stack => [1, 2], :args => [], :control_flow => :next
33
+ opcode 20, :dup_many, :stack => [[0,1], [0, 1, 2]],:args => [:count], :control_flow => :next
34
+ opcode 21, :pop, :stack => [1, 0], :args => [], :control_flow => :next
35
+ opcode 22, :pop_many, :stack => [[0,1], 0], :args => [:count], :control_flow => :next
36
+ opcode 23, :rotate, :stack => [[0,1], [0, 1, 1]],:args => [:count], :control_flow => :next
37
+ opcode 24, :move_down, :stack => [[0,1], [0, 1, 1]],:args => [:positions], :control_flow => :next
32
38
 
33
39
  # Manipulate local variables
34
- opcode 19, :set_local, :stack => [1, 1], :args => [:local], :control_flow => :next
35
- opcode 20, :push_local, :stack => [0, 1], :args => [:local], :control_flow => :next
36
- opcode 21, :push_local_depth, :stack => [0, 1], :args => [:depth, :index], :control_flow => :next
37
- opcode 22, :set_local_depth, :stack => [1, 1], :args => [:depth, :index], :control_flow => :next
38
- opcode 23, :passed_arg, :stack => [0, 1], :args => [:index], :control_flow => :next
40
+ opcode 25, :set_local, :stack => [1, 1], :args => [:local], :control_flow => :next
41
+ opcode 26, :push_local, :stack => [0, 1], :args => [:local], :control_flow => :next
42
+ opcode 27, :push_local_depth, :stack => [0, 1], :args => [:depth, :index], :control_flow => :next
43
+ opcode 28, :set_local_depth, :stack => [1, 1], :args => [:depth, :index], :control_flow => :next
44
+ opcode 29, :passed_arg, :stack => [0, 1], :args => [:index], :control_flow => :next
39
45
 
40
46
  # Manipulate exceptions
41
- opcode 24, :push_current_exception, :stack => [0, 1], :args => [], :control_flow => :next
42
- opcode 25, :clear_exception, :stack => [0, 0], :args => [], :control_flow => :next
43
- opcode 26, :push_exception_state, :stack => [0, 1], :args => [], :control_flow => :next
44
- opcode 27, :restore_exception_state, :stack => [1, 0], :args => [], :control_flow => :next
45
- opcode 28, :raise_exc, :stack => [1, 0], :args => [], :control_flow => :raise
46
- opcode 29, :setup_unwind, :stack => [0, 0], :args => [:ip, :type], :control_flow => :handler
47
- opcode 30, :pop_unwind, :stack => [0, 0], :args => [], :control_flow => :next
48
- opcode 31, :raise_return, :stack => [1, 1], :args => [], :control_flow => :raise
49
- opcode 32, :ensure_return, :stack => [1, 1], :args => [], :control_flow => :raise
50
- opcode 33, :raise_break, :stack => [1, 1], :args => [], :control_flow => :raise
51
- opcode 34, :reraise, :stack => [0, 0], :args => [], :control_flow => :raise
47
+ opcode 30, :push_current_exception, :stack => [0, 1], :args => [], :control_flow => :next
48
+ opcode 31, :clear_exception, :stack => [0, 0], :args => [], :control_flow => :next
49
+ opcode 32, :push_exception_state, :stack => [0, 1], :args => [], :control_flow => :next
50
+ opcode 33, :restore_exception_state, :stack => [1, 0], :args => [], :control_flow => :next
51
+ opcode 34, :raise_exc, :stack => [1, 0], :args => [], :control_flow => :raise
52
+ opcode 35, :setup_unwind, :stack => [0, 0], :args => [:ip, :type], :control_flow => :handler
53
+ opcode 36, :pop_unwind, :stack => [0, 0], :args => [], :control_flow => :next
54
+ opcode 37, :raise_return, :stack => [1, 1], :args => [], :control_flow => :raise
55
+ opcode 38, :ensure_return, :stack => [1, 1], :args => [], :control_flow => :raise
56
+ opcode 39, :raise_break, :stack => [1, 1], :args => [], :control_flow => :raise
57
+ opcode 40, :reraise, :stack => [0, 0], :args => [], :control_flow => :raise
52
58
 
53
59
  # Manipulate arrays
54
- opcode 35, :make_array, :stack => [[0,1], 1], :args => [:count], :control_flow => :next
55
- opcode 36, :cast_array, :stack => [1, 1], :args => [], :control_flow => :next
56
- opcode 37, :shift_array, :stack => [1, 2], :args => [], :control_flow => :next
60
+ opcode 41, :make_array, :stack => [[0,1], 1], :args => [:count], :control_flow => :next
61
+ opcode 42, :cast_array, :stack => [1, 1], :args => [], :control_flow => :next
62
+ opcode 43, :shift_array, :stack => [1, 2], :args => [], :control_flow => :next
57
63
 
58
64
  # Manipulate instance variables
59
- opcode 38, :set_ivar, :stack => [1, 1], :args => [:literal], :control_flow => :next
60
- opcode 39, :push_ivar, :stack => [0, 1], :args => [:literal], :control_flow => :next
65
+ opcode 44, :set_ivar, :stack => [1, 1], :args => [:literal], :control_flow => :next
66
+ opcode 45, :push_ivar, :stack => [0, 1], :args => [:literal], :control_flow => :next
61
67
 
62
68
  # Manipulate constants
63
- opcode 40, :push_const, :stack => [0, 1], :args => [:literal], :control_flow => :next
64
- opcode 41, :set_const, :stack => [1, 1], :args => [:literal], :control_flow => :next
65
- opcode 42, :set_const_at, :stack => [2, 1], :args => [:literal], :control_flow => :next
66
- opcode 43, :find_const, :stack => [1, 1], :args => [:literal], :control_flow => :next
67
- opcode 44, :push_cpath_top, :stack => [0, 1], :args => [], :control_flow => :next
68
- opcode 45, :push_const_fast, :stack => [0, 1], :args => [:literal], :control_flow => :next
69
- opcode 46, :find_const_fast, :stack => [1, 1], :args => [:literal], :control_flow => :next
69
+ opcode 46, :push_const, :stack => [0, 1], :args => [:literal], :control_flow => :next
70
+ opcode 47, :set_const, :stack => [1, 1], :args => [:literal], :control_flow => :next
71
+ opcode 48, :set_const_at, :stack => [2, 1], :args => [:literal], :control_flow => :next
72
+ opcode 49, :find_const, :stack => [1, 1], :args => [:literal], :control_flow => :next
73
+ opcode 50, :push_cpath_top, :stack => [0, 1], :args => [], :control_flow => :next
74
+ opcode 51, :push_const_fast, :stack => [0, 1], :args => [:literal], :control_flow => :next
75
+ opcode 52, :find_const_fast, :stack => [1, 1], :args => [:literal], :control_flow => :next
70
76
 
71
77
  # Send messages
72
- opcode 47, :set_call_flags, :stack => [0, 0], :args => [:flags], :control_flow => :next
73
- opcode 48, :allow_private, :stack => [0, 0], :args => [], :control_flow => :next
74
- opcode 49, :send_method, :stack => [1, 1], :args => [:literal], :control_flow => :send
75
- opcode 50, :send_stack, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
76
- opcode 51, :send_stack_with_block, :stack => [[2,2], 1], :args => [:literal, :count], :control_flow => :send
78
+ opcode 53, :set_call_flags, :stack => [0, 0], :args => [:flags], :control_flow => :next
79
+ opcode 54, :allow_private, :stack => [0, 0], :args => [], :control_flow => :next
80
+ opcode 55, :send_method, :stack => [1, 1], :args => [:literal], :control_flow => :send
81
+ opcode 56, :send_stack, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
82
+ opcode 57, :send_stack_with_block, :stack => [[2,2], 1], :args => [:literal, :count], :control_flow => :send
77
83
 
78
84
  CALL_FLAG_CONCAT = 2
79
85
 
80
- opcode 52, :send_stack_with_splat, :stack => [[3,2], 1], :args => [:literal, :count], :control_flow => :send
81
- opcode 53, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
82
- opcode 54, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count], :control_flow => :send
86
+ opcode 58, :send_stack_with_splat, :stack => [[3,2], 1], :args => [:literal, :count], :control_flow => :send
87
+ opcode 59, :send_super_stack_with_block, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
88
+ opcode 60, :send_super_stack_with_splat, :stack => [[2,2], 1], :args => [:literal, :count], :control_flow => :send
83
89
 
84
90
  # Manipulate blocks
85
- opcode 55, :push_block, :stack => [0, 1], :args => [], :control_flow => :next
86
- opcode 56, :passed_blockarg, :stack => [0, 1], :args => [:count], :control_flow => :next
87
- opcode 57, :create_block, :stack => [0, 1], :args => [:literal], :control_flow => :next
88
- opcode 58, :cast_for_single_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
89
- opcode 59, :cast_for_multi_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
90
- opcode 60, :cast_for_splat_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
91
- opcode 61, :yield_stack, :stack => [[0,1], 1], :args => [:count], :control_flow => :yield
92
- opcode 62, :yield_splat, :stack => [[1,1], 1], :args => [:count], :control_flow => :yield
91
+ opcode 61, :push_block, :stack => [0, 1], :args => [], :control_flow => :next
92
+ opcode 62, :passed_blockarg, :stack => [0, 1], :args => [:count], :control_flow => :next
93
+ opcode 63, :create_block, :stack => [0, 1], :args => [:literal], :control_flow => :next
94
+ opcode 64, :cast_for_single_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
95
+ opcode 65, :cast_for_multi_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
96
+ opcode 66, :cast_for_splat_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
97
+ opcode 67, :yield_stack, :stack => [[0,1], 1], :args => [:count], :control_flow => :yield
98
+ opcode 68, :yield_splat, :stack => [[1,1], 1], :args => [:count], :control_flow => :yield
93
99
 
94
100
  # Manipulate strings
95
- opcode 63, :string_append, :stack => [2, 1], :args => [], :control_flow => :next
96
- opcode 64, :string_build, :stack => [[0,1], 1], :args => [:count], :control_flow => :next
97
- opcode 65, :string_dup, :stack => [1, 1], :args => [], :control_flow => :next
101
+ opcode 69, :string_append, :stack => [2, 1], :args => [], :control_flow => :next
102
+ opcode 70, :string_build, :stack => [[0,1], 1], :args => [:count], :control_flow => :next
103
+ opcode 71, :string_dup, :stack => [1, 1], :args => [], :control_flow => :next
98
104
 
99
105
  # Manipulate scope
100
- opcode 66, :push_scope, :stack => [0, 1], :args => [], :control_flow => :next
101
- opcode 67, :add_scope, :stack => [1, 0], :args => [], :control_flow => :next
102
- opcode 68, :push_variables, :stack => [0, 1], :args => [], :control_flow => :next
106
+ opcode 72, :push_scope, :stack => [0, 1], :args => [], :control_flow => :next
107
+ opcode 73, :add_scope, :stack => [1, 0], :args => [], :control_flow => :next
108
+ opcode 74, :push_variables, :stack => [0, 1], :args => [], :control_flow => :next
103
109
 
104
110
  # Miscellaneous. TODO: better categorize these
105
- opcode 69, :check_interrupts, :stack => [0, 0], :args => [], :control_flow => :next
106
- opcode 70, :yield_debugger, :stack => [0, 0], :args => [], :control_flow => :next
107
- opcode 71, :is_nil, :stack => [1, 1], :args => [], :control_flow => :next
108
- opcode 72, :check_serial, :stack => [1, 1], :args => [:literal, :serial], :control_flow => :next
109
- opcode 73, :check_serial_private, :stack => [1, 1], :args => [:literal, :serial], :control_flow => :next
111
+ opcode 75, :check_interrupts, :stack => [0, 0], :args => [], :control_flow => :next
112
+ opcode 76, :yield_debugger, :stack => [0, 0], :args => [], :control_flow => :next
113
+ opcode 77, :is_nil, :stack => [1, 1], :args => [], :control_flow => :next
114
+ opcode 78, :check_serial, :stack => [1, 1], :args => [:literal, :serial], :control_flow => :next
115
+ opcode 79, :check_serial_private, :stack => [1, 1], :args => [:literal, :serial], :control_flow => :next
110
116
 
111
117
  # Access object fields
112
- opcode 74, :push_my_field, :stack => [0, 1], :args => [:index], :control_flow => :next
113
- opcode 75, :store_my_field, :stack => [1, 1], :args => [:index], :control_flow => :next
118
+ opcode 80, :push_my_field, :stack => [0, 1], :args => [:index], :control_flow => :next
119
+ opcode 81, :store_my_field, :stack => [1, 1], :args => [:index], :control_flow => :next
114
120
 
115
121
  # Type checks
116
- opcode 76, :kind_of, :stack => [2, 1], :args => [], :control_flow => :next
117
- opcode 77, :instance_of, :stack => [2, 1], :args => [], :control_flow => :next
122
+ opcode 82, :kind_of, :stack => [2, 1], :args => [], :control_flow => :next
123
+ opcode 83, :instance_of, :stack => [2, 1], :args => [], :control_flow => :next
118
124
 
119
125
  # Optimizations
120
- opcode 78, :meta_push_neg_1, :stack => [0, 1], :args => [], :control_flow => :next
121
- opcode 79, :meta_push_0, :stack => [0, 1], :args => [], :control_flow => :next
122
- opcode 80, :meta_push_1, :stack => [0, 1], :args => [], :control_flow => :next
123
- opcode 81, :meta_push_2, :stack => [0, 1], :args => [], :control_flow => :next
124
- opcode 82, :meta_send_op_plus, :stack => [2, 1], :args => [:literal], :control_flow => :send
125
- opcode 83, :meta_send_op_minus, :stack => [2, 1], :args => [:literal], :control_flow => :send
126
- opcode 84, :meta_send_op_equal, :stack => [2, 1], :args => [:literal], :control_flow => :send
127
- opcode 85, :meta_send_op_lt, :stack => [2, 1], :args => [:literal], :control_flow => :next
128
- opcode 86, :meta_send_op_gt, :stack => [2, 1], :args => [:literal], :control_flow => :next
129
- opcode 87, :meta_send_op_tequal, :stack => [2, 1], :args => [:literal], :control_flow => :send
130
- opcode 88, :meta_send_call, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
126
+ opcode 84, :meta_push_neg_1, :stack => [0, 1], :args => [], :control_flow => :next
127
+ opcode 85, :meta_push_0, :stack => [0, 1], :args => [], :control_flow => :next
128
+ opcode 86, :meta_push_1, :stack => [0, 1], :args => [], :control_flow => :next
129
+ opcode 87, :meta_push_2, :stack => [0, 1], :args => [], :control_flow => :next
130
+ opcode 88, :meta_send_op_plus, :stack => [2, 1], :args => [:literal], :control_flow => :send
131
+ opcode 89, :meta_send_op_minus, :stack => [2, 1], :args => [:literal], :control_flow => :send
132
+ opcode 90, :meta_send_op_equal, :stack => [2, 1], :args => [:literal], :control_flow => :send
133
+ opcode 91, :meta_send_op_lt, :stack => [2, 1], :args => [:literal], :control_flow => :next
134
+ opcode 92, :meta_send_op_gt, :stack => [2, 1], :args => [:literal], :control_flow => :next
135
+ opcode 93, :meta_send_op_tequal, :stack => [2, 1], :args => [:literal], :control_flow => :send
136
+ opcode 94, :meta_send_call, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
131
137
 
132
138
  # More misc
133
- opcode 89, :push_my_offset, :stack => [0, 1], :args => [:index], :control_flow => :next
134
- opcode 90, :zsuper, :stack => [1, 1], :args => [:literal], :control_flow => :next
135
- opcode 91, :push_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
136
- opcode 92, :push_undef, :stack => [0, 1], :args => [], :control_flow => :next
137
- opcode 93, :push_stack_local, :stack => [0, 1], :args => [:which], :control_flow => :next
138
- opcode 94, :set_stack_local, :stack => [1, 1], :args => [:which], :control_flow => :next
139
- opcode 95, :push_has_block, :stack => [0, 1], :args => [], :control_flow => :next
140
- opcode 96, :push_proc, :stack => [0, 1], :args => [], :control_flow => :next
141
- opcode 97, :check_frozen, :stack => [1, 1], :args => [], :control_flow => :next
142
- opcode 98, :cast_multi_value, :stack => [1, 1], :args => [], :control_flow => :next
143
- opcode 99, :invoke_primitive, :stack => [[0,2], 1], :args => [:literal, :count], :control_flow => :next
144
- opcode 100, :push_rubinius, :stack => [0, 1], :args => [], :control_flow => :next
145
- opcode 101, :call_custom, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
146
- opcode 102, :meta_to_s, :stack => [1, 1], :args => [:literal], :control_flow => :send
147
- opcode 103, :push_type, :stack => [0, 1], :args => [], :control_flow => :next
148
- opcode 104, :push_mirror, :stack => [0, 1], :args => [], :control_flow => :next
139
+ opcode 95, :push_my_offset, :stack => [0, 1], :args => [:index], :control_flow => :next
140
+ opcode 96, :zsuper, :stack => [1, 1], :args => [:literal], :control_flow => :next
141
+ opcode 97, :push_block_arg, :stack => [0, 1], :args => [], :control_flow => :next
142
+ opcode 98, :push_undef, :stack => [0, 1], :args => [], :control_flow => :next
143
+ opcode 99, :push_stack_local, :stack => [0, 1], :args => [:which], :control_flow => :next
144
+ opcode 100, :set_stack_local, :stack => [1, 1], :args => [:which], :control_flow => :next
145
+ opcode 101, :push_has_block, :stack => [0, 1], :args => [], :control_flow => :next
146
+ opcode 102, :push_proc, :stack => [0, 1], :args => [], :control_flow => :next
147
+ opcode 103, :check_frozen, :stack => [1, 1], :args => [], :control_flow => :next
148
+ opcode 104, :cast_multi_value, :stack => [1, 1], :args => [], :control_flow => :next
149
+ opcode 105, :invoke_primitive, :stack => [[0,2], 1], :args => [:literal, :count], :control_flow => :next
150
+ opcode 106, :push_rubinius, :stack => [0, 1], :args => [], :control_flow => :next
151
+ opcode 107, :call_custom, :stack => [[1,2], 1], :args => [:literal, :count], :control_flow => :send
152
+ opcode 108, :meta_to_s, :stack => [1, 1], :args => [:literal], :control_flow => :send
153
+ opcode 109, :push_type, :stack => [0, 1], :args => [], :control_flow => :next
154
+ opcode 110, :push_mirror, :stack => [0, 1], :args => [], :control_flow => :next
149
155
  end
150
156
  end
data/lib/rubinius/compiler/printers.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: us-ascii -*-
2
2
 
3
- module Rubinius::ToolSets.current::ToolSet
3
+ module CodeTools
4
4
  class Compiler
5
5
  class Printer < Stage
6
6
  def initialize
data/lib/rubinius/compiler/runtime.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: us-ascii -*-
2
2
 
3
- module Rubinius::ToolSets.current::ToolSet
3
+ module CodeTools
4
4
  module Compiler::Runtime
5
5
  def self.matches_when(array, receiver)
6
6
  array.each { |x| return true if x === receiver }
data/lib/rubinius/compiler/stages.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: us-ascii -*-
2
2
 
3
- module Rubinius::ToolSets.current::ToolSet
3
+ module CodeTools
4
4
  class Compiler
5
5
  Stages = { }
6
6
 
@@ -134,7 +134,7 @@ module Rubinius::ToolSets.current::ToolSet
134
134
  end
135
135
 
136
136
  # AST -> symbolic bytecode
137
- class Generator < Stage
137
+ class Bytecode < Stage
138
138
  stage :bytecode
139
139
  next_stage Encoder
140
140
 
@@ -144,7 +144,7 @@ module Rubinius::ToolSets.current::ToolSet
144
144
  super
145
145
  @variable_scope = nil
146
146
  compiler.generator = self
147
- @processor = ToolSet::Generator
147
+ @processor = Generator
148
148
  end
149
149
 
150
150
  def run
@@ -214,7 +214,7 @@ module Rubinius::ToolSets.current::ToolSet
214
214
  # source file -> AST
215
215
  class FileParser < Parser
216
216
  stage :file
217
- next_stage Generator
217
+ next_stage Bytecode
218
218
 
219
219
  def input(file, line=1)
220
220
  @file = file
@@ -229,7 +229,7 @@ module Rubinius::ToolSets.current::ToolSet
229
229
  # source string -> AST
230
230
  class StringParser < Parser
231
231
  stage :string
232
- next_stage Generator
232
+ next_stage Bytecode
233
233
 
234
234
  def input(string, name="(eval)", line=1)
235
235
  @input = string
@@ -244,7 +244,7 @@ module Rubinius::ToolSets.current::ToolSet
244
244
 
245
245
  class EvalParser < StringParser
246
246
  stage :eval
247
- next_stage Generator
247
+ next_stage Bytecode
248
248
 
249
249
  def should_cache?
250
250
  @output.should_cache?
data/lib/rubinius/compiler/version.rb CHANGED
@@ -1,5 +1,5 @@
1
- module Rubinius::ToolSets.current::ToolSet
1
+ module CodeTools
2
2
  class Compiler
3
- VERSION = "1.1.2"
3
+ VERSION = "1.2.0"
4
4
  end
5
5
  end
data/rubinius-compiler.gemspec CHANGED
@@ -1,10 +1,9 @@
1
1
  # coding: utf-8
2
- require 'rubinius/toolset'
3
2
  require './lib/rubinius/compiler/version'
4
3
 
5
4
  Gem::Specification.new do |spec|
6
5
  spec.name = "rubinius-compiler"
7
- spec.version = Rubinius::ToolSets.current::ToolSet::Compiler::VERSION
6
+ spec.version = CodeTools::Compiler::VERSION
8
7
  spec.authors = ["Brian Shirai"]
9
8
  spec.email = ["brixen@gmail.com"]
10
9
  spec.description = %q{Rubinius bytecode compiler.}
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubinius-compiler
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brian Shirai
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-20 00:00:00.000000000 Z
11
+ date: 2014-12-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler