Merge pull request livecode#1824 from runrevmark/feature-lcb_type_exports

livecodefraser · livecodefraser · commit 475dc9f06959 · 2015-02-27T12:41:43.000Z
[[ LCB ]] Ensure types are exported in the interface module.
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -1135,8 +1135,27 @@ bool MCScriptWriteInterfaceOfModule(MCScriptModuleRef self, MCStreamRef stream)
                 switch(t_type -> kind)
                 {
                     case kMCScriptTypeKindForeign:
+                    {
                         __writeln(stream, "foreign type %@", t_def_name);
+                    }
+                    break;
+                    case kMCScriptTypeKindHandler:
+                    {
+                        MCAutoStringRef t_sig;
+                        type_to_string(self, static_cast<MCScriptTypeDefinition *>(t_def) -> type, &t_sig);
+                        __writeln(stream, "handler type %@%@", t_def_name, *t_sig);
+                    }
+                    break;
+                    case kMCScriptTypeKindRecord:
+                        // TODO - Records not yet supported
                         break;
+                    default:
+                    {
+                        MCAutoStringRef t_sig;
+                        type_to_string(self, static_cast<MCScriptTypeDefinition *>(t_def) -> type, &t_sig);
+                        __writeln(stream, "type %@ is %@", t_def_name, *t_sig);
+                    }
+                    break;
                 }
             }
             break;
diff --git a/toolchain/lc-compile/src/grammar.g b/toolchain/lc-compile/src/grammar.g
@@ -180,6 +180,12 @@
     'rule' ImportDefinition(-> type(Position, public, Id, foreign(Position, ""))):
         "foreign" @(-> Position) "type" Identifier(-> Id)
     
+    'rule' ImportDefinition(-> type(Position, public, Id, handler(Position, Signature))):
+        "handler" @(-> Position) "type" Identifier(-> Id) Signature(-> Signature)
+        
+    'rule' ImportDefinition(-> type(Position, public, Id, Type)):
+        "type" @(-> Position) Identifier(-> Id) "is" Type(-> Type)
+
     'rule' ImportDefinition(-> constant(Position, public, Id, nil)):
         "constant" @(-> Position) Identifier(-> Id)
 
