Remove dependencies on the old lexer/parser

Author: eregon

src/main/java/org/truffleruby/core/time/GetTimeZoneNode.java

@@ -28,6 +28,7 @@
 import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -41,7 +42,6 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.library.RubyStringLibrary;
-import org.truffleruby.parser.Helpers;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -97,7 +97,7 @@ protected TimeZoneAndName getTimeZone(Object tz) {
         }
     }
 
-    private static final Map<String, String> LONG_TZNAME = Helpers.map(
+    private static final Map<String, String> LONG_TZNAME = map(
             "MET",
             "CET", // JRUBY-2759
             "ROC",
@@ -106,6 +106,14 @@ protected TimeZoneAndName getTimeZone(Object tz) {
             "Europe/Lisbon" // Western European Time
     );
 
+    private static Map<String, String> map(String... keyValues) {
+        HashMap<String, String> map = new HashMap<>(keyValues.length / 2);
+        for (int i = 0; i < keyValues.length;) {
+            map.put(keyValues[i++], keyValues[i++]);
+        }
+        return map;
+    }
+
     private static final Pattern TZ_PATTERN = Pattern.compile("([a-zA-Z]{3,}+)([\\+-]?)(\\d+)(?::(\\d+))?(?::(\\d+))?");
 
     private TimeZoneAndName parse(String zone) {

src/main/java/org/truffleruby/language/arguments/ArgumentDescriptorUtils.java

@@ -19,7 +19,7 @@
 import org.truffleruby.parser.ArgumentType;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import org.truffleruby.parser.parser.ParserSupport;
+import org.truffleruby.parser.TranslatorEnvironment;
 
 public final class ArgumentDescriptorUtils {
 
@@ -49,7 +49,7 @@ private static RubyArray toArray(RubyLanguage language, RubyContext context, Arg
             store = new Object[]{ language.getSymbol(argType.symbolicName) };
         } else {
             // make sure to normalize parameter names to "_" if they start with "_$"
-            if (name.startsWith(ParserSupport.UNDERSCORE_PREFIX)) {
+            if (name.startsWith(TranslatorEnvironment.UNDERSCORE_PREFIX)) {
                 name = "_";
             }
 

src/main/java/org/truffleruby/parser/TranslatorEnvironment.java

@@ -37,7 +37,6 @@
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import org.truffleruby.language.objects.SelfNode;
 import org.truffleruby.language.threadlocal.SpecialVariableStorage;
-import org.truffleruby.parser.parser.ParserSupport;
 
 public final class TranslatorEnvironment {
 
@@ -51,16 +50,21 @@ public final class TranslatorEnvironment {
 
     /** local variable to access a block argument */
     public static final String METHOD_BLOCK_NAME = Layouts.TEMP_PREFIX + "method_block_arg";
+
     /** local variable name for * parameter */
-    static final String DEFAULT_REST_NAME = ParserSupport.REST_VAR;
+    static final String DEFAULT_REST_NAME = Layouts.TEMP_PREFIX + "unnamed_rest";
     /** local variable name for ** parameter */
-    static final String DEFAULT_KEYWORD_REST_NAME = ParserSupport.KWREST_VAR;
+    static final String DEFAULT_KEYWORD_REST_NAME = Layouts.TEMP_PREFIX + "kwrest";
     /** local variable name for * parameter caused by desugaring ... parameter (forward-everything) */
-    static final String FORWARDED_REST_NAME = ParserSupport.FORWARD_ARGS_REST_VAR;
+
+    static final String FORWARDED_REST_NAME = Layouts.TEMP_PREFIX + "forward_rest";
     /** local variable name for ** parameter caused by desugaring ... parameter (forward-everything) */
-    static final String FORWARDED_KEYWORD_REST_NAME = ParserSupport.FORWARD_ARGS_KWREST_VAR;
+    static final String FORWARDED_KEYWORD_REST_NAME = Layouts.TEMP_PREFIX + "forward_kwrest";
     /** local variable name for & parameter caused by desugaring ... parameter (forward-everything) */
-    static final String FORWARDED_BLOCK_NAME = ParserSupport.FORWARD_ARGS_BLOCK_VAR;
+    static final String FORWARDED_BLOCK_NAME = Layouts.TEMP_PREFIX + "forward_block";
+
+    /** A prefix for duplicated '_' local variables to build unique names */
+    public static final String UNDERSCORE_PREFIX = "_$";
 
     private final ParseEnvironment parseEnvironment;