Merge pull request #6282 from livecodeali/bugfix-20874

livecodeali · web-flow · commit 141e7f4dfd78 · 2018-01-25T09:23:54.000Z
[[ Bug 20874 ]] Fix incorrect private imports from assembly support module
diff --git a/docs/lcb/notes/20874.md b/docs/lcb/notes/20874.md
@@ -0,0 +1,5 @@
+# LiveCode Builder Tools
+## lc-compile
+
+# [20874] Take access type into account when importing assembly support module definitions
+
diff --git a/toolchain/lc-compile/src/bind.g b/toolchain/lc-compile/src/bind.g
@@ -136,29 +136,29 @@
     'rule' DeclareImportedDefinitions(Module, unsafe(_, Definition)):
         DeclareImportedDefinitions(Module, Definition)
 
-    'rule' DeclareImportedDefinitions(Module, type(Position, _, Name, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, type(Position, Access, Name, _)):
+        DeclareImportedId(Module, Access, Name)
 
-    'rule' DeclareImportedDefinitions(Module, constant(Position, _, Name, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, constant(Position, Access, Name, _)):
+        DeclareImportedId(Module, Access, Name)
     
-    'rule' DeclareImportedDefinitions(Module, variable(Position, _, Name, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, variable(Position, Access, Name, _)):
+        DeclareImportedId(Module, Access, Name)
 
-    'rule' DeclareImportedDefinitions(Module, handler(Position, _, Name, _, _, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, handler(Position, Access, Name, _, _, _)):
+        DeclareImportedId(Module, Access, Name)
     
-    'rule' DeclareImportedDefinitions(Module, foreignhandler(Position, _, Name, _, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, foreignhandler(Position, Access, Name, _, _)):
+        DeclareImportedId(Module, Access, Name)
     
-    'rule' DeclareImportedDefinitions(Module, property(Position, _, Name, _, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, property(Position, Access, Name, _, _)):
+        DeclareImportedId(Module, Access, Name)
     
-    'rule' DeclareImportedDefinitions(Module, event(Position, _, Name, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, event(Position, Access, Name, _)):
+        DeclareImportedId(Module, Access, Name)
 
-    'rule' DeclareImportedDefinitions(Module, syntax(Position, _, Name, _, _, _, _)):
-        DeclareImportedId(Module, Name)
+    'rule' DeclareImportedDefinitions(Module, syntax(Position, Access, Name, _, _, _, _)):
+        DeclareImportedId(Module, Access, Name)
 
     'rule' DeclareImportedDefinitions(Module, metadata(_, _, _)):
         -- do nothing
@@ -631,12 +631,15 @@
 
 'condition' ResolveNamespace(OPTIONALID -> NAME)
 
-'action' DeclareImportedId(ID, ID)
+'action' DeclareImportedId(ID, ACCESS, ID)
 
-	'rule' DeclareImportedId(Namespace, Id):
+	'rule' DeclareImportedId(Namespace, public, Id):
 		Id'Namespace <- id(Namespace)
 		DeclareNamespacedId(Id)
 
+	'rule' DeclareImportedId(Namespace, Access, Id):
+        -- don't import non-public ids
+
 -- Ensure all module-level declarations have module namespace
 'action' DeclareId(ID)
 
