More legacy package lookup/installation cleanups.

Raku · Apr 27, 2011 · c408fe7 · c408fe7
1 parent 5d65440
commit c408fe7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/Regex/Cursor.pir b/src/Regex/Cursor.pir
@@ -52,9 +52,6 @@ grammars.
     $P0 = nqp_get_sc "__REGEX_CORE_SC__"
     nqp_set_sc_object "__REGEX_CORE_SC__", 0, type_obj
     nqp_set_sc_for_object type_obj, $P0
-
-    # XXXNS Old namespace handling installation, during migration to new.
-    set_hll_global ["Regex"], "Cursor", type_obj
 
     # Add all methods.
     .const 'Sub' $P10 = 'Regex_Cursor_meth_new_match'

diff --git a/src/Regex/Match.pir b/src/Regex/Match.pir
@@ -31,7 +31,6 @@ This file implements Match objects for the regex engine.
     NQPClassHOW = $P0["class"]
     type_obj = NQPClassHOW."new_type"("Match" :named("name"))
     RegexWHO["Match"] = type_obj
-    set_global "$?CLASS", type_obj
     how = get_how type_obj
 
     # XXXNS Old namespace handling installation, during migration to new.

diff --git a/src/Regex/Method.pir b/src/Regex/Method.pir
@@ -31,10 +31,7 @@ containers for Regex subs that need .ACCEPTS and other regex attributes.
     RegexWHO["Method"] = method_type_obj
     set_global "$?CLASS", method_type_obj
     method_how = get_how method_type_obj
-
-    # XXXNS Old namespace handling installation, during migration to new.
-    set_hll_global ["Regex"], "Method", method_type_obj
-
+
     # Set default parent.
     .local pmc def_parent
     def_parent = find_lex "NQPMu"
@@ -134,7 +131,11 @@ Perform a match against target, return the result.
     .param pmc target
 
     .local pmc curproto, match
-    curproto = get_hll_global ['Regex'], 'Cursor'
+    curproto = get_hll_global 'GLOBAL'
+    curproto = get_who curproto
+    curproto = curproto["Regex"]
+    curproto = get_who curproto
+    curproto = curproto["Cursor"]
     match = curproto.'parse'(target, 'rule'=>self)
     .return (match)
 .end
@@ -145,7 +146,11 @@ Perform a match against target, return the result.
     .param pmc target
 
     .local pmc curproto, match
-    curproto = get_hll_global ['Regex'], 'Cursor'
+    curproto = get_hll_global 'GLOBAL'
+    curproto = get_who curproto
+    curproto = curproto["Regex"]
+    curproto = get_who curproto
+    curproto = curproto["Cursor"]
     match = curproto.'parse'(target, 'rule'=>self, 'c'=>0)
     .return (match)
 .end