Skip to content
Permalink
Browse files
8261642: improve jextract source generation mode and remove class gen…
…eration

Reviewed-by: jvernee, sundar
  • Loading branch information
mcimadamore committed Feb 15, 2021
1 parent 4d7180a commit e4cd13dfc2b5a398645067bb6cb0807ad451f6df
Showing with 1,199 additions and 2,108 deletions.
  1. +3 −3 src/jdk.incubator.jextract/share/classes/jdk/incubator/jextract/JextractTool.java
  2. +0 −570 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/ClassConstantHelper.java
  3. +399 −0 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/ConstantBuilder.java
  4. +0 −62 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/ConstantHelper.java
  5. +37 −28 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/FunctionalInterfaceBuilder.java
  6. +176 −56 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/HeaderFileBuilder.java
  7. +165 −158 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/JavaSourceBuilder.java
  8. +0 −131 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/MultiFileConstantHelper.java
  9. +32 −10 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/NestedClassBuilder.java
  10. +35 −132 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/OutputFactory.java
  11. +0 −521 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/SourceConstantHelper.java
  12. +0 −70 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/StringSourceBuilder.java
  13. +200 −188 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/StructBuilder.java
  14. +123 −32 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/ToplevelBuilder.java
  15. +25 −32 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/TypedefBuilder.java
  16. +0 −1 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/Writer.java
  17. +0 −21 src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/resources/C.java.template
  18. +2 −2 ...incubator.jextract/share/classes/jdk/internal/jextract/impl/resources/RuntimeHelper.java.template
  19. +0 −55 test/jdk/tools/jextract/Test8252302.java
  20. +2 −4 test/jdk/tools/jextract/TestSplit.java
  21. +0 −32 test/jdk/tools/jextract/test8252302.h
@@ -117,8 +117,8 @@ public static Declaration.Scoped filter(Declaration.Scoped decl, String... inclu
}

public static List<JavaFileObject> generate(Declaration.Scoped decl, String headerName,
boolean source, String targetPkg, List<String> libNames) {
return List.of(OutputFactory.generateWrapped(decl, headerName, source, targetPkg, libNames));
String targetPkg, List<String> libNames) {
return List.of(OutputFactory.generateWrapped(decl, headerName, targetPkg, libNames));
}

/**
@@ -254,7 +254,7 @@ private int run(String[] args) {
}

files = generate(
toplevel, header.getFileName().toString(), options.source,
toplevel, header.getFileName().toString(),
options.targetPackage, options.libraryNames);
} catch (ClangException ce) {
err.println(ce.getMessage());

This file was deleted.

0 comments on commit e4cd13d

Please sign in to comment.