--frozen-string-literals must be a language option

Author: eregon

src/main/java/org/truffleruby/options/LanguageOptions.java

@@ -21,6 +21,8 @@
 // @formatter:off
 public class LanguageOptions {
 
+    /** --frozen-string-literals=false */
+    public final boolean FROZEN_STRING_LITERALS;
     /** --lazy-default=true */
     public final boolean DEFAULT_LAZY;
     /** --lazy-translation-user=DEFAULT_LAZY */
@@ -49,6 +51,7 @@ public class LanguageOptions {
     public final boolean SHARED_OBJECTS_FORCE;
 
     public LanguageOptions(Env env, OptionValues options) {
+        FROZEN_STRING_LITERALS = options.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY);
         DEFAULT_LAZY = options.get(OptionsCatalog.DEFAULT_LAZY_KEY);
         LAZY_TRANSLATION_USER = options.hasBeenSet(OptionsCatalog.LAZY_TRANSLATION_USER_KEY) ? options.get(OptionsCatalog.LAZY_TRANSLATION_USER_KEY) : DEFAULT_LAZY;
         BACKTRACES_OMIT_UNUSED = options.get(OptionsCatalog.BACKTRACES_OMIT_UNUSED_KEY);
@@ -66,6 +69,8 @@ public LanguageOptions(Env env, OptionValues options) {
 
     public Object fromDescriptor(OptionDescriptor descriptor) {
         switch (descriptor.getName()) {
+            case "ruby.frozen-string-literals":
+                return FROZEN_STRING_LITERALS;
             case "ruby.lazy-default":
                 return DEFAULT_LAZY;
             case "ruby.lazy-translation-user":
@@ -98,7 +103,8 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
     }
 
     public static boolean areOptionsCompatible(OptionValues one, OptionValues two) {
-        return one.get(OptionsCatalog.DEFAULT_LAZY_KEY).equals(two.get(OptionsCatalog.DEFAULT_LAZY_KEY)) &&
+        return one.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY).equals(two.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY)) &&
+               one.get(OptionsCatalog.DEFAULT_LAZY_KEY).equals(two.get(OptionsCatalog.DEFAULT_LAZY_KEY)) &&
                one.get(OptionsCatalog.LAZY_TRANSLATION_USER_KEY).equals(two.get(OptionsCatalog.LAZY_TRANSLATION_USER_KEY)) &&
                one.get(OptionsCatalog.BACKTRACES_OMIT_UNUSED_KEY).equals(two.get(OptionsCatalog.BACKTRACES_OMIT_UNUSED_KEY)) &&
                one.get(OptionsCatalog.LAZY_TRANSLATION_LOG_KEY).equals(two.get(OptionsCatalog.LAZY_TRANSLATION_LOG_KEY)) &&

src/main/java/org/truffleruby/options/Options.java

@@ -45,8 +45,6 @@ public class Options {
     public final String LAUNCHER;
     /** --core-load-path="resource:/truffleruby" */
     public final String CORE_LOAD_PATH;
-    /** --frozen-string-literals=false */
-    public final boolean FROZEN_STRING_LITERALS;
     /** --rubygems=true */
     public final boolean RUBYGEMS;
     /** --lazy-rubygems=RUBYGEMS && DEFAULT_LAZY */
@@ -264,7 +262,6 @@ public Options(Env env, OptionValues options, LanguageOptions languageOptions) {
         NO_HOME_PROVIDED = options.get(OptionsCatalog.NO_HOME_PROVIDED_KEY);
         LAUNCHER = options.get(OptionsCatalog.LAUNCHER_KEY);
         CORE_LOAD_PATH = options.get(OptionsCatalog.CORE_LOAD_PATH_KEY);
-        FROZEN_STRING_LITERALS = options.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY);
         RUBYGEMS = options.get(OptionsCatalog.RUBYGEMS_KEY);
         LAZY_RUBYGEMS = RUBYGEMS && (options.hasBeenSet(OptionsCatalog.LAZY_RUBYGEMS_KEY) ? options.get(OptionsCatalog.LAZY_RUBYGEMS_KEY) : languageOptions.DEFAULT_LAZY);
         PATCHING = options.get(OptionsCatalog.PATCHING_KEY);
@@ -393,8 +390,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return LAUNCHER;
             case "ruby.core-load-path":
                 return CORE_LOAD_PATH;
-            case "ruby.frozen-string-literals":
-                return FROZEN_STRING_LITERALS;
             case "ruby.rubygems":
                 return RUBYGEMS;
             case "ruby.lazy-rubygems":

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

@@ -133,7 +133,7 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
 
             parentEnvironment = environmentForFrame(context, parentFrame);
         } else {
-            parentEnvironment = environmentForFrame(context, null);
+            parentEnvironment = null;
         }
 
         if (argumentNames != null) {
@@ -151,7 +151,7 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
                 !isEvalParse,
                 false);
 
-        if (context.getOptions().FROZEN_STRING_LITERALS) {
+        if (language.options.FROZEN_STRING_LITERALS) {
             parserConfiguration.setFrozenStringLiteral(true);
         }
 

src/options.yml

@@ -1,4 +1,5 @@
 LANGUAGE_OPTIONS:
+- FROZEN_STRING_LITERALS
 - BACKTRACES_OMIT_UNUSED
 - LAZY_TRANSLATION_USER
 - HASH_PACKED_ARRAY_MAX