Browse Source

Merged branch develop into master

Mark Sibly 8 years ago
parent
commit
19c360389c

+ 24 - 0
src/c2mx2/test.h

@@ -0,0 +1,24 @@
+
+struct S{
+};
+
+typedef S MS;
+
+void update( S &s );
+
+void update2( const S *s );
+
+void update3( const MS *s );
+
+class C{
+	public:
+	
+	int x,y,z;
+	
+	void update( S &s );
+	
+	const S &render();
+};
+
+float A,B,C;
+

+ 19 - 0
src/c2mx2/test.json

@@ -0,0 +1,19 @@
+{
+	"clangArgs":[
+		"-Xclang",
+		"-std=c++11",
+		"-I."
+	],
+	
+	"inputFile":"test.h",
+	
+	"outputDir":"test_api",
+	
+	"outputFile":"test",
+	
+	"header":[
+		"",
+		"Extern",
+		""
+	]
+}

+ 21 - 0
src/c2mx2/test_api/test.monkey2

@@ -0,0 +1,21 @@
+
+'***** File: test.h *****
+
+Extern
+
+Struct S
+End
+Alias MS:S
+Function update:Void( s:S Ptr )="update_glue"
+Function update2:Void( s:S Ptr )
+Function update3:Void( s:MS Ptr )
+Class C Extends Void
+	Field x:Int
+	Field y:Int
+	Field z:Int
+	Method update:Void( s:S Ptr ) Extension="C_update_glue"
+	Method render:(  )
+End
+Global A:Float
+Global B:Float
+Global C:Float

+ 3 - 0
src/c2mx2/test_api/test_extern.monkey2

@@ -0,0 +1,3 @@
+
+#Import "test"
+

+ 6 - 0
src/c2mx2/test_api/test_glue.cpp

@@ -0,0 +1,6 @@
+void update_glue(S * s){
+	return update(*s);
+}
+void C_update_glue(C * _this,S * s){
+	return _this->update(*s);
+}

+ 2 - 0
src/c2mx2/test_api/test_glue.h

@@ -0,0 +1,2 @@
+void update_glue(S * s);
+void C_update_glue(C * _this,S * s);

+ 1 - 1
src/ted2/modulemanager.monkey2

@@ -174,7 +174,7 @@ Class ModuleManager Extends Dialog
 			
 			
 			Case FileType.None
 			Case FileType.None
 			
 			
-				If DeleteDir( dst,True )
+				If Not DeleteDir( dst,True )
 					Alert( "Failed to delete module dir '"+dst+"'" )
 					Alert( "Failed to delete module dir '"+dst+"'" )
 					Return False
 					Return False
 				Endif
 				Endif