Merge pull request #1129 from jacob-carlborg/objc_docs

Add documentation for interfacing with Objective-C
dlang · Oct 13, 2015 · c0b2da9 · c0b2da9
2 parents 825bb02 + 1ad9976
commit c0b2da9
Show file tree

Hide file tree

Showing 8 changed files with 384 additions and 4 deletions.
diff --git a/attribute.dd b/attribute.dd
@@ -82,6 +82,7 @@ $(GNAME LinkageType):
     $(D Windows)
     $(D Pascal)
     $(D System)
+    $(D Objective-C)
 )
 
         $(P D provides an easy way to call C functions and operating
@@ -91,6 +92,9 @@ $(GNAME LinkageType):
         $(D C) and $(D D) must be supplied, the others are what
         makes sense for the implementation.
         $(D C++) offers limited compatibility with C++.
+        $(D Objective-C) offers limited compatibility with Objective-C,
+        see the $(LINK2 objc_interface.html, Interfacing to Objective-C)
+        documentation for more information.
         $(D System) is the same as $(D Windows) on Windows platforms,
         and $(D C) on other platforms.
         $(D Implementation Note:)

diff --git a/doc.ddoc b/doc.ddoc
@@ -48,6 +48,7 @@ $(DIVID cssmenu, $(UL
         $(ROOT_DIR)ddoc.html, Embedded Documentation,
         $(ROOT_DIR)interfaceToC.html, Interfacing to C,
         $(ROOT_DIR)cpp_interface.html, Interfacing to C++,
+        $(ROOT_DIR)objc_interface.html, Interfacing to Objective-C,
         $(ROOT_DIR)portability.html, Portability Guide,
         $(ROOT_DIR)entity.html, Named Character Entities,
         $(ROOT_DIR)memory-safe-d.html, Memory Safety,

diff --git a/grammar.dd b/grammar.dd
@@ -1607,6 +1607,7 @@ $(GNAME LinkageType):
     $(D Windows)
     $(D Pascal)
     $(D System)
+    $(D Objective-C)
 )
 
 $(GRAMMAR