Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8a0f1ec

Browse files
committed
Create Legacy module for legacy YARV instructions
1 parent 5abcb5a commit 8a0f1ec

File tree

3 files changed

+141
-137
lines changed

3 files changed

+141
-137
lines changed

lib/syntax_tree/compiler.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -870,18 +870,18 @@ def visit_defined(node)
870870
case value
871871
when Const
872872
iseq.putnil
873-
iseq.defined(YARV::Defined::CONST, name, "constant")
873+
iseq.defined(YARV::Defined::TYPE_CONST, name, "constant")
874874
when CVar
875875
iseq.putnil
876-
iseq.defined(YARV::Defined::CVAR, name, "class variable")
876+
iseq.defined(YARV::Defined::TYPE_CVAR, name, "class variable")
877877
when GVar
878878
iseq.putnil
879-
iseq.defined(YARV::Defined::GVAR, name, "global-variable")
879+
iseq.defined(YARV::Defined::TYPE_GVAR, name, "global-variable")
880880
when Ident
881881
iseq.putobject("local-variable")
882882
when IVar
883883
iseq.putnil
884-
iseq.defined(YARV::Defined::IVAR, name, "instance-variable")
884+
iseq.defined(YARV::Defined::TYPE_IVAR, name, "instance-variable")
885885
when Kw
886886
case name
887887
when :false
@@ -898,13 +898,13 @@ def visit_defined(node)
898898
iseq.putself
899899

900900
name = node.value.value.value.to_sym
901-
iseq.defined(YARV::Defined::FUNC, name, "method")
901+
iseq.defined(YARV::Defined::TYPE_FUNC, name, "method")
902902
when YieldNode
903903
iseq.putnil
904-
iseq.defined(YARV::Defined::YIELD, false, "yield")
904+
iseq.defined(YARV::Defined::TYPE_YIELD, false, "yield")
905905
when ZSuper
906906
iseq.putnil
907-
iseq.defined(YARV::Defined::ZSUPER, false, "super")
907+
iseq.defined(YARV::Defined::TYPE_ZSUPER, false, "super")
908908
else
909909
iseq.putobject("expression")
910910
end
@@ -1875,24 +1875,24 @@ def opassign_defined(node)
18751875
name = node.target.constant.value.to_sym
18761876

18771877
iseq.dup
1878-
iseq.defined(YARV::Defined::CONST_FROM, name, true)
1878+
iseq.defined(YARV::Defined::TYPE_CONST_FROM, name, true)
18791879
when TopConstField
18801880
name = node.target.constant.value.to_sym
18811881

18821882
iseq.putobject(Object)
18831883
iseq.dup
1884-
iseq.defined(YARV::Defined::CONST_FROM, name, true)
1884+
iseq.defined(YARV::Defined::TYPE_CONST_FROM, name, true)
18851885
when VarField
18861886
name = node.target.value.value.to_sym
18871887
iseq.putnil
18881888

18891889
case node.target.value
18901890
when Const
1891-
iseq.defined(YARV::Defined::CONST, name, true)
1891+
iseq.defined(YARV::Defined::TYPE_CONST, name, true)
18921892
when CVar
1893-
iseq.defined(YARV::Defined::CVAR, name, true)
1893+
iseq.defined(YARV::Defined::TYPE_CVAR, name, true)
18941894
when GVar
1895-
iseq.defined(YARV::Defined::GVAR, name, true)
1895+
iseq.defined(YARV::Defined::TYPE_GVAR, name, true)
18961896
end
18971897
end
18981898

lib/syntax_tree/yarv.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,14 +434,14 @@ def getblockparamproxy(index, level)
434434

435435
def getclassvariable(name)
436436
if RUBY_VERSION < "3.0"
437-
push(GetClassVariableUncached.new(name))
437+
push(Legacy::GetClassVariable.new(name))
438438
else
439439
push(GetClassVariable.new(name, inline_storage_for(name)))
440440
end
441441
end
442442

443443
def getconstant(name)
444-
push(GetConstant.new(name))
444+
push(Legacy::GetConstant.new(name))
445445
end
446446

447447
def getglobal(name)

0 commit comments

Comments
 (0)