3502

Better implementation of commit 3445: not requiring types for special
variables in scenarios. It turned out that it wasn't working anytime we
needed to call 'get' on a special variable inside a scenario. After
moving that work to an earlier transform we can now use 'filesystem'
without a type inside scenarios.

1 files changed, 4 insertions, 2 deletions

diff --git a/089scenario_filesystem.cc b/089scenario_filesystem.cc
index 25b1a4c4..078757a5 100644
--- a/089scenario_filesystem.cc
+++ b/089scenario_filesystem.cc
@@ -20,7 +20,7 @@ scenario foo [
       |xyz|
     ]
   ]
-  data:&:@:file-mapping <- get *filesystem:&:filesystem, data:offset
+  data:&:@:file-mapping <- get *filesystem, data:offset
   file1:file-mapping <- index *data, 0
   file1-name:text <- get file1, name:offset
   10:@:char/raw <- copy *file1-name
@@ -59,7 +59,7 @@ scenario foo [
       |x\\\\|yz|
     ]
   ]
-  data:&:@:file-mapping <- get *filesystem:&:filesystem, data:offset
+  data:&:@:file-mapping <- get *filesystem, data:offset
   file1:file-mapping <- index *data, 0
   file1-name:text <- get file1, name:offset
   10:@:char/raw <- copy *file1-name
@@ -80,6 +80,8 @@ Name[r]["filesystem"] = FILESYSTEM;
 //: make 'filesystem' always a raw location in scenarios
 :(before "End is_special_name Cases")
 if (s == "filesystem") return true;
+:(before "End Initialize Type Of Special Name In Scenario(r)")
+if (r.name == "filesystem") r.type = new_type_tree("address:filesystem");
 
 :(before "End initialize_transform_rewrite_literal_string_to_text()")
 recipes_taking_literal_strings.insert("assume-filesystem");