Author: rfm
Date: Thu Mar 3 11:20:33 2016
New Revision: 39449
URL: http://svn.gna.org/viewcvs/gnustep?rev=39449&view=rev
Log:
new version for generics support
Modified:
libs/java/trunk/ChangeLog
libs/java/trunk/GNUmakefile
libs/java/trunk/Source/GNUmakefile
libs/java/trunk/Source/JIGS.h
libs/java/trunk/Tools/WrapCreator/WCTypeLoader.m
libs/java/trunk/Tools/WrapCreator/WCVoidType.h
Modified: libs/java/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/java/trunk/ChangeLog?rev=39449&r1=39448&r2=39449&view=diff
==============================================================================
--- libs/java/trunk/ChangeLog (original)
+++ libs/java/trunk/ChangeLog Thu Mar 3 11:20:33 2016
@@ -1,3 +1,13 @@
+2016-03-03 Richard Frith-Macdonald <[email protected]>
+
+ * Tools/WrapCreator/WCTypeLoader.m: Allow for 'instancetype' used by
+ generics.
+ * Tools/WrapCreator/WCVoidType.h: Fix incorrect guard check
+ * GNUmakefile (VERSION, PACKAGE_VERSION): Version 1.6.3.
+ * Source/JIGS.h (GNUSTEP_JAVA_VERSION,
+ GNUSTEP_JAVA_SUBMINOR_VERSION): Version 1.6.3.
+ * Source/GNUmakefile (VERSION): Version 1.6.3.
+
2013-08-18 Nicola Pero <[email protected]>
* GNUmakefile (VERSION, PACKAGE_VERSION): Version 1.6.2.
Modified: libs/java/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/java/trunk/GNUmakefile?rev=39449&r1=39448&r2=39449&view=diff
==============================================================================
--- libs/java/trunk/GNUmakefile (original)
+++ libs/java/trunk/GNUmakefile Thu Mar 3 11:20:33 2016
@@ -43,8 +43,8 @@
PACKAGE_NAME = jigs
# Keep it in sync manually with Source/JIGS.h and Source/GNUmakefile
-VERSION = 1.6.2
-PACKAGE_VERSION = 1.6.2
+VERSION = 1.6.3
+PACKAGE_VERSION = 1.6.3
SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/libs
SVN_MODULE_NAME = java
Modified: libs/java/trunk/Source/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/java/trunk/Source/GNUmakefile?rev=39449&r1=39448&r2=39449&view=diff
==============================================================================
--- libs/java/trunk/Source/GNUmakefile (original)
+++ libs/java/trunk/Source/GNUmakefile Thu Mar 3 11:20:33 2016
@@ -27,7 +27,7 @@
LIBRARY_NAME = libgnustep-java
-VERSION = 1.6.2
+VERSION = 1.6.3
libgnustep-java_HEADER_FILES = \
ObjcRuntimeUtilities.h \
Modified: libs/java/trunk/Source/JIGS.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/java/trunk/Source/JIGS.h?rev=39449&r1=39448&r2=39449&view=diff
==============================================================================
--- libs/java/trunk/Source/JIGS.h (original)
+++ libs/java/trunk/Source/JIGS.h Thu Mar 3 11:20:33 2016
@@ -24,10 +24,10 @@
#ifndef __JIGS_h_GNUSTEP_JAVA_INCLUDE
#define __JIGS_h_GNUSTEP_JAVA_INCLUDE
-#define GNUSTEP_JAVA_VERSION 1.6.2
+#define GNUSTEP_JAVA_VERSION 1.6.3
#define GNUSTEP_JAVA_MAJOR_VERSION 1
#define GNUSTEP_JAVA_MINOR_VERSION 6
-#define GNUSTEP_JAVA_SUBMINOR_VERSION 2
+#define GNUSTEP_JAVA_SUBMINOR_VERSION 3
#include <jni.h>
#include <Foundation/Foundation.h>
Modified: libs/java/trunk/Tools/WrapCreator/WCTypeLoader.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/java/trunk/Tools/WrapCreator/WCTypeLoader.m?rev=39449&r1=39448&r2=39449&view=diff
==============================================================================
--- libs/java/trunk/Tools/WrapCreator/WCTypeLoader.m (original)
+++ libs/java/trunk/Tools/WrapCreator/WCTypeLoader.m Thu Mar 3 11:20:33 2016
@@ -4,24 +4,24 @@
Author: Nicola Pero <[email protected]>
Date: August 2000
-
+
This file is part of JIGS, the GNUstep Java Interface.
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* This class knows all the WCType concrete subclasses, and creates
+/* This class knows all the WCType concrete subclasses, and creates
the right one for the right objective-C type. */
#include "WCBOOLType.h"
@@ -50,35 +50,35 @@
#define DEFAULT_MORPHTYPES_NUMBER 7
static const struct morphType
-{
- NSString *objcName;
- NSString *javaName;
+{
+ NSString *objcName;
+ NSString *javaName;
NSString *jniName;
NSString *javaArgumentType;
- NSString *java2objc;
- NSString *objc2java;
+ NSString *java2objc;
+ NSString *objc2java;
} defaultMorphTypes[DEFAULT_MORPHTYPES_NUMBER] = {
- { @"NSString *", @"String", @"jstring", @"Ljava.lang.String;",
+ { @"NSString *", @"String", @"jstring", @"Ljava.lang.String;",
@"JIGSNSStringFromJstring", @"JIGSJstringFromNSString" },
- { @"NSNumber *", @"Number", @"jobject", @"Ljava.lang.Number;",
+ { @"NSNumber *", @"Number", @"jobject", @"Ljava.lang.Number;",
@"GSJNI_NSNumberFromJNumber", @"GSJNI_JNumberFromNSNumber" },
- { @"NSPoint", @"NSPoint", @"jobject", @"Lgnu.gnustep.base.NSPoint;",
+ { @"NSPoint", @"NSPoint", @"jobject", @"Lgnu.gnustep.base.NSPoint;",
@"JIGSNSPointConvertToStruct", @"JIGSNSPointConvertToJobject" },
- { @"NSSize", @"NSSize", @"jobject", @"Lgnu.gnustep.base.NSSize;",
+ { @"NSSize", @"NSSize", @"jobject", @"Lgnu.gnustep.base.NSSize;",
@"JIGSNSSizeConvertToStruct", @"JIGSNSSizeConvertToJobject" },
- { @"NSRect", @"NSRect", @"jobject", @"Lgnu.gnustep.base.NSRect;",
+ { @"NSRect", @"NSRect", @"jobject", @"Lgnu.gnustep.base.NSRect;",
@"JIGSNSRectConvertToStruct", @"JIGSNSRectConvertToJobject" },
- { @"NSRange", @"NSRange", @"jobject", @"Lgnu.gnustep.base.NSRange;",
+ { @"NSRange", @"NSRange", @"jobject", @"Lgnu.gnustep.base.NSRange;",
@"JIGSNSRangeConvertToStruct", @"JIGSNSRangeConvertToJobject" },
- { @"SEL", @"NSSelector", @"jobject", @"Lgnu.gnustep.base.NSSelector;",
+ { @"SEL", @"NSSelector", @"jobject", @"Lgnu.gnustep.base.NSSelector;",
@"JIGSSELFromNSSelector", @"JIGSNSSelectorFromSEL" }
-
+
};
@implementation WCTypeLoader
@@ -97,6 +97,12 @@
{
t = [[WCIdType alloc] initWithObjcType: @"id"];
}
+ else if ([name isEqualToString: @"instancetype"] == YES)
+ {
+ /* For generics 'instancetype' is #defined to be an id
+ */
+ t = [[WCIdType alloc] initWithObjcType: @"id"];
+ }
else if ([name isEqualToString: @"NSInteger"] == YES)
{
t = [[WCNSIntegerType alloc] initWithObjcType: @"NSInteger"];
@@ -113,13 +119,13 @@
{
t = [[WCBOOLType alloc] initWithObjcType: @"BOOL"];
}
- else if (([name isEqualToString: @"int"] == YES)
- || ([name isEqualToString: @"signed"] == YES)
+ else if (([name isEqualToString: @"int"] == YES)
+ || ([name isEqualToString: @"signed"] == YES)
|| ([name isEqualToString: @"signed int"] == YES))
{
t = [[WCIntType alloc] initWithObjcType: name];
}
- else if (([name isEqualToString: @"unsigned int"] == YES)
+ else if (([name isEqualToString: @"unsigned int"] == YES)
|| ([name isEqualToString: @"unsigned"] == YES))
{
t = [[WCUnsignedIntType alloc] initWithObjcType: name];
@@ -201,14 +207,14 @@
break;
}
}
- }
+ }
if (t == nil && [name hasSuffix: @"*"] == YES)
{
- /* name is a wrapped objective-C class */
+ /* name is a wrapped objective-C class */
t = [[WCObjectType alloc] initWithObjcType: name];
}
if (t == nil)
- {
+ {
[NSException raise: NSGenericException
format: @"Unknown objective-C type %@", name];
}
@@ -217,4 +223,4 @@
@end
-
+
Modified: libs/java/trunk/Tools/WrapCreator/WCVoidType.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/java/trunk/Tools/WrapCreator/WCVoidType.h?rev=39449&r1=39448&r2=39449&view=diff
==============================================================================
--- libs/java/trunk/Tools/WrapCreator/WCVoidType.h (original)
+++ libs/java/trunk/Tools/WrapCreator/WCVoidType.h Thu Mar 3 11:20:33 2016
@@ -21,7 +21,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#ifndef __WCCVoidType_h_GNUSTEP_WrapCreator_INCLUDE
+#ifndef __WCVoidType_h_GNUSTEP_WrapCreator_INCLUDE
#define __WCVoidType_h_GNUSTEP_WrapCreator_INCLUDE
#include "WCType.h"
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
