JavaCL: adapt generator to latest JNAerator changes

ochafik · ochafik · commit 96d7d0285253 · 2013-07-28T19:56:51.000+01:00
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java
@@ -132,7 +132,7 @@ public boolean isObjCppPrimitive(String s) {
                 declarationsConverter = new BridJDeclarationsConverter(this) {
 
                     @Override
-                    public void convertFunction(Function function, Signatures signatures, boolean isCallback, DeclarationsHolder out, Identifier libraryClassName, int iConstructor) {
+                    public void convertFunction(Function function, Signatures signatures, boolean isCallback, DeclarationsHolder declarations, DeclarationsHolder implementations, Identifier libraryClassName, int iConstructor) {
                         if (isCallback)
                             return;
 
@@ -153,7 +153,7 @@ public void convertFunction(Function function, Signatures signatures, boolean is
                                 return;
 
                             try {
-                                tr = result.typeConverter.resolveTypeDef(tr, null/*libraryClassName*/, false, false);
+                                tr = result.typeConverter.normalizeTypeRef(tr);//, null/*libraryClassName*/, false, false);
                                 List<Modifier> mods = arg.harvestModifiers();
 
                                 TypeRef convTr;
@@ -183,7 +183,7 @@ public void convertFunction(Function function, Signatures signatures, boolean is
                                 convArgExpr.add(argExpr);//varRef(argName));
 
                             } catch (UnsupportedConversionException ex) {
-                                out.addDeclaration(skipDeclaration(function, ex.toString()));
+                                implementations.addDeclaration(skipDeclaration(function, ex.toString()));
                             }
                             iArg++;
                         }
@@ -196,7 +196,7 @@ public void convertFunction(Function function, Signatures signatures, boolean is
                         String functionName = function.getName().toString();
                         String kernelVarName = functionName + "_kernel";
                         if (signatures.addVariable(kernelVarName))
-                        		out.addDeclaration(new VariablesDeclaration(typeRef(CLKernel.class), new Declarator.DirectDeclarator(kernelVarName)));
+                        		implementations.addDeclaration(new VariablesDeclaration(typeRef(CLKernel.class), new Declarator.DirectDeclarator(kernelVarName)));
                         Function method = new Function(Function.Type.JavaMethod, ident(functionName), typeRef(CLEvent.class));
                         method.addModifiers(ModifierType.Public, ModifierType.Synchronized);
                         method.addThrown(typeRef(CLBuildException.class));
@@ -240,7 +240,7 @@ public void convertFunction(Function function, Signatures signatures, boolean is
                         );
                         method.setBody(block(statements.toArray(new Statement[statements.size()])));
                         if (signatures.addMethod(method))
-                        		out.addDeclaration(method);
+                        		implementations.addDeclaration(method);
                     }
                 };
                 globalsGenerator = new BridJGlobalsGenerator(this);
@@ -460,13 +460,14 @@ protected void generateLibraryFiles(SourceFiles sourceFiles, Result result) thro
 			result.typeConverter.allowFakePointers = true;
             String library = name;
             Identifier fullLibraryClassName = ident(className);
-			result.declarationsConverter.convertStructs(result.structsByLibrary.get(library), signatures, interf, fullLibraryClassName, library);
+            interf.setResolvedJavaIdentifier(fullLibraryClassName);
+			result.declarationsConverter.convertStructs(result.structsByLibrary.get(library), signatures, interf, library);
 			//result.declarationsConverter.convertCallbacks(result.callbacksByLibrary.get(library), signatures, interf, fullLibraryClassName);
 
             int declCount = interf.getDeclarations().size();
-			result.declarationsConverter.convertFunctions(result.functionsByLibrary.get(library), signatures, interf, fullLibraryClassName);
-            result.declarationsConverter.convertEnums(result.enumsByLibrary.get(library), signatures, interf, fullLibraryClassName);
-			result.declarationsConverter.convertConstants(library, result.definesByLibrary.get(library), sourceFiles, signatures, interf, fullLibraryClassName);
+			result.declarationsConverter.convertFunctions(result.functionsByLibrary.get(library), signatures, interf, interf);
+            result.declarationsConverter.convertEnums(result.enumsByLibrary.get(library), signatures, interf);
+			result.declarationsConverter.convertConstants(library, result.definesByLibrary.get(library), sourceFiles, signatures, interf);
 
             boolean hasKernels = interf.getDeclarations().size() > declCount;
             if (!hasKernels)
