[skiplang/skc] Remove redundant pkg_opt.

Author: beauby

skiplang/compiler/src/convertTree.sk

@@ -884,7 +884,6 @@ class Converter{file: FileCache.InputSource} {
   fun convertEnvMacro(_range: FileRange, varName: ParseTree): SkipAst.Expr_ {
     SkipAst.EnvMacro(
       this.createName(varName, varName.getToken().stringLiteralValue()),
-      this.file.pkg_opt,
     )
   }
 

skiplang/compiler/src/skipAst.sk

@@ -365,7 +365,7 @@ base class Expr_ {
     functionName: ?Name,
     body: Expr,
   )
-  | EnvMacro(Name, ?String)
+  | EnvMacro(Name)
   | MacroDot(Expr, Name)
   | MacroStaticDot(Expr, Name)
 }

skiplang/compiler/src/skipAstPp.sk

@@ -861,7 +861,7 @@ fun expr(o: mutable BufferedPrinter.Out, e: SkipAst.Expr): void {
     };
     o.out(") ");
     expr(o, body)
-  | SkipAst.EnvMacro(varName, _) ->
+  | SkipAst.EnvMacro(varName) ->
     o.out("#env (");
     o.out(literal_to_string(SkipAst.StringLiteral(varName.i1)));
     o.out(")")

skiplang/compiler/src/skipExpand.sk

@@ -3419,17 +3419,19 @@ fun expr_(
       functionName,
       expr(context, env, body),
     )
-  | A.EnvMacro(varName, pkg_opt) ->
+  | A.EnvMacro(varName) ->
+    (pos2, name) = varName;
     pkg_env = SKStore.EHandle(
       SKStore.SID::keyType,
       SKStore.StringFile::type,
       // FIXME: Ensure package names cannot start with an underscore to avoid clash with `_default`.
-      SKStore.DirName::create(`/packageEnv/${pkg_opt.default("_default")}/`),
+      SKStore.DirName::create(
+        `/packageEnv/${pos2.file.pkg_opt.default("_default")}/`,
+      ),
     );
-    name = varName.i1;
     value = pkg_env.maybeGet(context, SKStore.SID(name)) match {
     | None() ->
-      SkipError.error(varName.i0, `Environment variable ${name} is not set.`)
+      SkipError.error(pos2, `Environment variable ${name} is not set.`)
     | Some(v) -> v.value
     };
     // Record access to env variable.
@@ -3441,8 +3443,11 @@ fun expr_(
       FileCache.kEnvAccessGlobal,
       FileCache.EnvMapFile(
         cur_env_map.set(
-          pkg_opt,
-          cur_env_map.maybeGet(pkg_opt).default(SortedSet[]).set(name),
+          pos2.file.pkg_opt,
+          cur_env_map
+            .maybeGet(pos2.file.pkg_opt)
+            .default(SortedSet[])
+            .set(name),
         ),
       ),
     );