From 472a9c663a464727d75310e59ba3f6b3fdc99401 Mon Sep 17 00:00:00 2001 From: Evgenij Ryazanov Date: Mon, 17 Jan 2022 23:36:47 +0800 Subject: [PATCH 01/93] Use secure parser in H2AuthConfigXml to avoid future reports --- h2/src/docsrc/html/changelog.html | 2 +- .../org/h2/security/auth/H2AuthConfigXml.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html index 23c1e63e38..9750b5f4af 100644 --- a/h2/src/docsrc/html/changelog.html +++ b/h2/src/docsrc/html/changelog.html @@ -21,7 +21,7 @@

Change Log

Next Version (unreleased)

Nothing yet... +
PR #3382: Use secure parser in H2AuthConfigXml to avoid future reports

diff --git a/h2/src/main/org/h2/security/auth/H2AuthConfigXml.java b/h2/src/main/org/h2/security/auth/H2AuthConfigXml.java index b1f6888d59..fb1eb16f84 100644 --- a/h2/src/main/org/h2/security/auth/H2AuthConfigXml.java +++ b/h2/src/main/org/h2/security/auth/H2AuthConfigXml.java @@ -7,11 +7,16 @@ import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; import java.net.URL; + +import javax.xml.XMLConstants; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; + import org.xml.sax.Attributes; +import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -67,6 +72,11 @@ public void endElement(String uri, String localName, String qName) throws SAXExc } } + @Override + public InputSource resolveEntity(String publicId, String systemId) throws IOException, SAXException { + return new InputSource(new StringReader("")); + } + private static String getMandatoryAttributeValue(String attributeName, Attributes attributes) throws SAXException { String attributeValue=attributes.getValue(attributeName); if (attributeValue==null || attributeValue.trim().equals("")) { @@ -120,7 +130,13 @@ public static H2AuthConfig parseFrom(URL url) */ public static H2AuthConfig parseFrom(InputStream inputStream) throws SAXException, IOException, ParserConfigurationException { - SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); + spf.setFeature("http://xml.org/sax/features/external-general-entities", false); + spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); + SAXParser saxParser = spf.newSAXParser(); H2AuthConfigXml xmlHandler = new H2AuthConfigXml(); saxParser.parse(inputStream, xmlHandler); return xmlHandler.getResult(); From 47af4ae67327eeba9800f6109bfa914bce1514d4 Mon Sep 17 00:00:00 2001 From: Andrei Tokar Date: Mon, 17 Jan 2022 11:01:46 -0500 Subject: [PATCH 02/93] Version advancement --- h2/pom.xml | 2 +- h2/src/main/org/h2/engine/Constants.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/h2/pom.xml b/h2/pom.xml index a0c0085569..7a29f41f62 100644 --- a/h2/pom.xml +++ b/h2/pom.xml @@ -4,7 +4,7 @@ com.h2database h2 - 2.1.210 + 2.1.219-SNAPSHOT jar H2 Database Engine https://h2database.com diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java index d71cf6b656..9ba74005ca 100644 --- a/h2/src/main/org/h2/engine/Constants.java +++ b/h2/src/main/org/h2/engine/Constants.java @@ -21,12 +21,12 @@ public class Constants { * Sequential version number. Even numbers are used for official releases, * odd numbers are used for development builds. */ - public static final int BUILD_ID = 210; + public static final int BUILD_ID = 219; /** * Whether this is a snapshot version. */ - public static final boolean BUILD_SNAPSHOT = false; + public static final boolean BUILD_SNAPSHOT = true; /** * If H2 is compiled to be included in a product, this should be set to From 59fa857fd7b5fdf2cc912eae779ebff4353bd9a5 Mon Sep 17 00:00:00 2001 From: Andrei Tokar Date: Mon, 17 Jan 2022 11:02:27 -0500 Subject: [PATCH 03/93] release build adjustments --- h2/build.sh | 2 +- h2/src/tools/org/h2/build/Build.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/h2/build.sh b/h2/build.sh index 558a7945ab..769262d58b 100755 --- a/h2/build.sh +++ b/h2/build.sh @@ -15,4 +15,4 @@ if [ "$1" = "clean" ] ; then rm -rf temp bin ; fi if [ ! -d "temp" ] ; then mkdir temp ; fi if [ ! -d "bin" ] ; then mkdir bin ; fi "$JAVA_HOME/bin/javac" -sourcepath src/tools -d bin src/tools/org/h2/build/*.java -"$JAVA_HOME/bin/java" -Xmx512m -cp "bin:$JAVA_HOME/lib/tools.jar:temp" org.h2.build.Build $@ +"$JAVA_HOME/bin/java" -Xmx1g -cp "bin:$JAVA_HOME/lib/tools.jar:temp" org.h2.build.Build $@ diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java index 7d23858a3b..db504f165f 100644 --- a/h2/src/tools/org/h2/build/Build.java +++ b/h2/src/tools/org/h2/build/Build.java @@ -611,7 +611,6 @@ public void javadocImpl() { // need to be disabled if not enough memory File.pathSeparator + "src/test" + File.pathSeparator + "src/tools", - "-Xdoclint:all,-missing", "-noindex", "-d", "docs/javadocImpl2", "-classpath", javaToolsJar + @@ -652,6 +651,7 @@ public void javadocImpl() { javadoc("-sourcepath", "src/main" + File.pathSeparator + "src/test" + File.pathSeparator + "src/tools", + "-Xdoclint:all,-missing", "-d", "docs/javadoc", "-classpath", javaToolsJar + File.pathSeparator + "ext/slf4j-api-" + SLF4J_VERSION + ".jar" + From e54d057f12ed4d5c70a8c20494f3eeeaa8318b04 Mon Sep 17 00:00:00 2001 From: Evgenij Ryazanov Date: Tue, 18 Jan 2022 17:40:32 +0800 Subject: [PATCH 04/93] Bump minor version --- h2/pom.xml | 2 +- h2/src/main/org/h2/engine/Constants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/h2/pom.xml b/h2/pom.xml index 7a29f41f62..36fdd1e2a7 100644 --- a/h2/pom.xml +++ b/h2/pom.xml @@ -4,7 +4,7 @@ com.h2database h2 - 2.1.219-SNAPSHOT + 2.2.219-SNAPSHOT jar H2 Database Engine https://h2database.com diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java index 9ba74005ca..00b986728b 100644 --- a/h2/src/main/org/h2/engine/Constants.java +++ b/h2/src/main/org/h2/engine/Constants.java @@ -78,7 +78,7 @@ public class Constants { /** * The minor version of this database. */ - public static final int VERSION_MINOR = 1; + public static final int VERSION_MINOR = 2; /** * The lock mode that means no locking is used at all. From 43e0d798f1f05b67dc497340390ea8f92c806c07 Mon Sep 17 00:00:00 2001 From: Evgenij Ryazanov Date: Tue, 18 Jan 2022 17:48:58 +0800 Subject: [PATCH 05/93] Remove abandoned Java to C converter --- h2/src/tools/org/h2/java/ClassObj.java | 463 ----- h2/src/tools/org/h2/java/Expr.java | 736 ------- h2/src/tools/org/h2/java/Ignore.java | 13 - h2/src/tools/org/h2/java/JavaParser.java | 1848 ----------------- h2/src/tools/org/h2/java/Local.java | 14 - h2/src/tools/org/h2/java/Statement.java | 504 ----- h2/src/tools/org/h2/java/Test.java | 92 - h2/src/tools/org/h2/java/TestApp.java | 58 - h2/src/tools/org/h2/java/io/PrintStream.java | 24 - h2/src/tools/org/h2/java/io/package.html | 14 - h2/src/tools/org/h2/java/lang/Integer.java | 61 - h2/src/tools/org/h2/java/lang/Long.java | 62 - h2/src/tools/org/h2/java/lang/Math.java | 24 - h2/src/tools/org/h2/java/lang/Object.java | 27 - h2/src/tools/org/h2/java/lang/String.java | 222 -- .../tools/org/h2/java/lang/StringBuilder.java | 66 - h2/src/tools/org/h2/java/lang/System.java | 77 - h2/src/tools/org/h2/java/lang/package.html | 14 - h2/src/tools/org/h2/java/package.html | 14 - h2/src/tools/org/h2/java/util/Arrays.java | 74 - h2/src/tools/org/h2/java/util/package.html | 14 - 21 files changed, 4421 deletions(-) delete mode 100644 h2/src/tools/org/h2/java/ClassObj.java delete mode 100644 h2/src/tools/org/h2/java/Expr.java delete mode 100644 h2/src/tools/org/h2/java/Ignore.java delete mode 100644 h2/src/tools/org/h2/java/JavaParser.java delete mode 100644 h2/src/tools/org/h2/java/Local.java delete mode 100644 h2/src/tools/org/h2/java/Statement.java delete mode 100644 h2/src/tools/org/h2/java/Test.java delete mode 100644 h2/src/tools/org/h2/java/TestApp.java delete mode 100644 h2/src/tools/org/h2/java/io/PrintStream.java delete mode 100644 h2/src/tools/org/h2/java/io/package.html delete mode 100644 h2/src/tools/org/h2/java/lang/Integer.java delete mode 100644 h2/src/tools/org/h2/java/lang/Long.java delete mode 100644 h2/src/tools/org/h2/java/lang/Math.java delete mode 100644 h2/src/tools/org/h2/java/lang/Object.java delete mode 100644 h2/src/tools/org/h2/java/lang/String.java delete mode 100644 h2/src/tools/org/h2/java/lang/StringBuilder.java delete mode 100644 h2/src/tools/org/h2/java/lang/System.java delete mode 100644 h2/src/tools/org/h2/java/lang/package.html delete mode 100644 h2/src/tools/org/h2/java/package.html delete mode 100644 h2/src/tools/org/h2/java/util/Arrays.java delete mode 100644 h2/src/tools/org/h2/java/util/package.html diff --git a/h2/src/tools/org/h2/java/ClassObj.java b/h2/src/tools/org/h2/java/ClassObj.java deleted file mode 100644 index 88a84beb2d..0000000000 --- a/h2/src/tools/org/h2/java/ClassObj.java +++ /dev/null @@ -1,463 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -import java.util.ArrayList; -import java.util.LinkedHashMap; - -/** - * A class or interface. - */ -public class ClassObj { - - /** - * The super class (null for java.lang.Object or primitive types). - */ - String superClassName; - - /** - * The list of interfaces that this class implements. - */ - ArrayList interfaceNames = new ArrayList<>(); - - - /** - * The fully qualified class name. - */ - String className; - - /** - * Whether this is an interface. - */ - boolean isInterface; - - /** - * Whether this class is public. - */ - boolean isPublic; - - /** - * Whether this is a primitive class (int, char,...) - */ - boolean isPrimitive; - - /** - * The primitive type (higher types are more complex) - */ - int primitiveType; - - /** - * The imported classes. - */ - ArrayList imports = new ArrayList<>(); - - /** - * The per-instance fields. - */ - LinkedHashMap instanceFields = - new LinkedHashMap<>(); - - /** - * The static fields of this class. - */ - LinkedHashMap staticFields = - new LinkedHashMap<>(); - - /** - * The methods. - */ - LinkedHashMap> methods = - new LinkedHashMap<>(); - - /** - * The list of native statements. - */ - ArrayList nativeCode = new ArrayList<>(); - - /** - * The class number. - */ - int id; - - /** - * Get the base type of this class. - */ - Type baseType; - - ClassObj() { - baseType = new Type(); - baseType.classObj = this; - } - - /** - * Add a method. - * - * @param method the method - */ - void addMethod(MethodObj method) { - ArrayList list = methods.get(method.name); - if (list == null) { - list = new ArrayList<>(); - methods.put(method.name, list); - } else { - // for overloaded methods - // method.name = method.name + "_" + (list.size() + 1); - } - list.add(method); - } - - /** - * Add an instance field. - * - * @param field the field - */ - void addInstanceField(FieldObj field) { - instanceFields.put(field.name, field); - } - - /** - * Add a static field. - * - * @param field the field - */ - void addStaticField(FieldObj field) { - staticFields.put(field.name, field); - } - - @Override - public String toString() { - if (isPrimitive) { - return "j" + className; - } - return JavaParser.toC(className); - } - - /** - * Get the method. - * - * @param find the method name in the source code - * @param args the parameters - * @return the method - */ - MethodObj getMethod(String find, ArrayList args) { - ArrayList list = methods.get(find); - if (list == null) { - throw new RuntimeException("Method not found: " + className + " " + find); - } - if (list.size() == 1) { - return list.get(0); - } - for (MethodObj m : list) { - if (!m.isVarArgs && m.parameters.size() != args.size()) { - continue; - } - boolean match = true; - int i = 0; - for (FieldObj f : m.parameters.values()) { - Expr a = args.get(i++); - Type t = a.getType(); - if (!t.equals(f.type)) { - match = false; - break; - } - } - if (match) { - return m; - } - } - throw new RuntimeException("Method not found: " + className); - } - - /** - * Get the field with the given name. - * - * @param name the field name - * @return the field - */ - FieldObj getField(String name) { - return instanceFields.get(name); - } - - @Override - public int hashCode() { - return className.hashCode(); - } - - @Override - public boolean equals(Object other) { - if (other instanceof ClassObj) { - ClassObj c = (ClassObj) other; - return c.className.equals(className); - } - return false; - } - -} - -/** - * A method. - */ -class MethodObj { - - /** - * Whether the last parameter is a var args parameter. - */ - boolean isVarArgs; - - /** - * Whether this method is static. - */ - boolean isStatic; - - /** - * Whether this method is private. - */ - boolean isPrivate; - - /** - * Whether this method is overridden. - */ - boolean isVirtual; - - /** - * Whether this method is to be ignored (using the Ignore annotation). - */ - boolean isIgnore; - - /** - * The name. - */ - String name; - - /** - * The statement block (if any). - */ - Statement block; - - /** - * The return type. - */ - Type returnType; - - /** - * The parameter list. - */ - LinkedHashMap parameters = - new LinkedHashMap<>(); - - /** - * Whether this method is final. - */ - boolean isFinal; - - /** - * Whether this method is public. - */ - boolean isPublic; - - /** - * Whether this method is native. - */ - boolean isNative; - - /** - * Whether this is a constructor. - */ - boolean isConstructor; - - @Override - public String toString() { - return name; - } - -} - -/** - * A field. - */ -class FieldObj { - - /** - * The type. - */ - Type type; - - /** - * Whether this is a variable or parameter. - */ - boolean isVariable; - - /** - * Whether this is a local field (not separately garbage collected). - */ - boolean isLocalField; - - /** - * The field name. - */ - String name; - - /** - * Whether this field is static. - */ - boolean isStatic; - - /** - * Whether this field is final. - */ - boolean isFinal; - - /** - * Whether this field is private. - */ - boolean isPrivate; - - /** - * Whether this field is public. - */ - boolean isPublic; - - /** - * Whether this method is to be ignored (using the Ignore annotation). - */ - boolean isIgnore; - - /** - * The initial value expression (may be null). - */ - Expr value; - - /** - * The class where this field is declared. - */ - ClassObj declaredClass; - - @Override - public String toString() { - return name; - } - -} - -/** - * A type. - */ -class Type { - - /** - * The class. - */ - ClassObj classObj; - - /** - * The array nesting level. 0 if not an array. - */ - int arrayLevel; - - /** - * Whether this is a var args parameter. - */ - boolean isVarArgs; - - /** - * Use ref-counting. - */ - boolean refCount = JavaParser.REF_COUNT; - - /** - * Whether this is a array or an non-primitive type. - * - * @return true if yes - */ - public boolean isObject() { - return arrayLevel > 0 || !classObj.isPrimitive; - } - - @Override - public String toString() { - return asString(); - } - - /** - * Get the C++ code. - * - * @return the C++ code - */ - public String asString() { - StringBuilder buff = new StringBuilder(); - for (int i = 0; i < arrayLevel; i++) { - if (refCount) { - buff.append("ptr< "); - } - buff.append("array< "); - } - if (refCount) { - if (!classObj.isPrimitive) { - buff.append("ptr< "); - } - } - buff.append(classObj.toString()); - if (refCount) { - if (!classObj.isPrimitive) { - buff.append(" >"); - } - } - for (int i = 0; i < arrayLevel; i++) { - if (refCount) { - buff.append(" >"); - } else { - if (!classObj.isPrimitive) { - buff.append("*"); - } - } - buff.append(" >"); - } - if (!refCount) { - if (isObject()) { - buff.append("*"); - } - } - return buff.toString(); - } - - @Override - public int hashCode() { - return toString().hashCode(); - } - - @Override - public boolean equals(Object other) { - if (other instanceof Type) { - Type t = (Type) other; - return t.classObj.equals(classObj) && t.arrayLevel == arrayLevel - && t.isVarArgs == isVarArgs; - } - return false; - } - - /** - * Get the default value, for primitive types (0 usually). - * - * @param context the context - * @return the expression - */ - public Expr getDefaultValue(JavaParser context) { - if (classObj.isPrimitive) { - LiteralExpr literal = new LiteralExpr(context, classObj.className); - literal.literal = "0"; - CastExpr cast = new CastExpr(); - cast.type = this; - cast.expr = literal; - cast.type = this; - return cast; - } - LiteralExpr literal = new LiteralExpr(context, classObj.className); - literal.literal = "null"; - return literal; - } - -} - diff --git a/h2/src/tools/org/h2/java/Expr.java b/h2/src/tools/org/h2/java/Expr.java deleted file mode 100644 index ed72d184bd..0000000000 --- a/h2/src/tools/org/h2/java/Expr.java +++ /dev/null @@ -1,736 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -import java.util.ArrayList; -import java.util.Iterator; - -/** - * An expression. - */ -public interface Expr { - - /** - * Get the C++ code. - * - * @return the C++ code - */ - String asString(); - - Type getType(); - void setType(Type type); - -} - -/** - * The base expression class. - */ -abstract class ExprBase implements Expr { - @Override - public final String toString() { - return "_" + asString() + "_"; - } -} - -/** - * A method call. - */ -class CallExpr extends ExprBase { - - /** - * The parameters. - */ - final ArrayList args = new ArrayList<>(); - - private final JavaParser context; - private final String className; - private final String name; - private Expr expr; - private ClassObj classObj; - private MethodObj method; - private Type type; - - CallExpr(JavaParser context, Expr expr, String className, String name) { - this.context = context; - this.expr = expr; - this.className = className; - this.name = name; - } - - private void initMethod() { - if (method != null) { - return; - } - if (className != null) { - classObj = context.getClassObj(className); - } else { - classObj = expr.getType().classObj; - } - method = classObj.getMethod(name, args); - if (method.isStatic) { - expr = null; - } - } - - @Override - public String asString() { - StringBuilder buff = new StringBuilder(); - initMethod(); - if (method.isIgnore) { - if (args.isEmpty()) { - // ignore - } else if (args.size() == 1) { - buff.append(args.get(0)); - } else { - throw new IllegalArgumentException( - "Cannot ignore method with multiple arguments: " + method); - } - } else { - if (expr == null) { - // static method - buff.append(JavaParser.toC(classObj.toString() + "." + method.name)); - } else { - buff.append(expr.asString()).append("->"); - buff.append(method.name); - } - buff.append("("); - int i = 0; - Iterator paramIt = method.parameters.values().iterator(); - for (Expr a : args) { - if (i > 0) { - buff.append(", "); - } - FieldObj f = paramIt.next(); - i++; - a.setType(f.type); - buff.append(a.asString()); - } - buff.append(")"); - } - return buff.toString(); - } - - @Override - public Type getType() { - initMethod(); - return method.returnType; - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * A assignment expression. - */ -class AssignExpr extends ExprBase { - - /** - * The target variable or field. - */ - Expr left; - - /** - * The operation (=, +=,...). - */ - String op; - - /** - * The expression. - */ - Expr right; - - /** - * The type. - */ - Type type; - - @Override - public String asString() { - right.setType(left.getType()); - return left.asString() + " " + op + " " + right.asString(); - } - - @Override - public Type getType() { - return left.getType(); - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * A conditional expression. - */ -class ConditionalExpr extends ExprBase { - - /** - * The condition. - */ - Expr condition; - - /** - * The 'true' expression. - */ - Expr ifTrue; - - /** - * The 'false' expression. - */ - Expr ifFalse; - - @Override - public String asString() { - return condition.asString() + " ? " + ifTrue.asString() + " : " - + ifFalse.asString(); - } - - @Override - public Type getType() { - return ifTrue.getType(); - } - - @Override - public void setType(Type type) { - ifTrue.setType(type); - ifFalse.setType(type); - } - -} - -/** - * A literal. - */ -class LiteralExpr extends ExprBase { - - /** - * The literal expression. - */ - String literal; - - private final JavaParser context; - private final String className; - private Type type; - - public LiteralExpr(JavaParser context, String className) { - this.context = context; - this.className = className; - } - - @Override - public String asString() { - if ("null".equals(literal)) { - Type t = getType(); - if (t.isObject()) { - return "(" + getType().asString() + ") 0"; - } - return t.asString() + "()"; - } - return literal; - } - - @Override - public Type getType() { - if (type == null) { - type = new Type(); - type.classObj = context.getClassObj(className); - } - return type; - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * An operation. - */ -class OpExpr extends ExprBase { - - /** - * The left hand side. - */ - Expr left; - - /** - * The operation. - */ - String op; - - /** - * The right hand side. - */ - Expr right; - - private final JavaParser context; - private Type type; - - OpExpr(JavaParser context) { - this.context = context; - } - - @Override - public String asString() { - if (left == null) { - return op + right.asString(); - } else if (right == null) { - return left.asString() + op; - } - if (op.equals(">>>")) { - // ujint / ujlong - return "(((u" + left.getType() + ") " + left + ") >> " + right + ")"; - } else if (op.equals("+")) { - if (left.getType().isObject() || right.getType().isObject()) { - // TODO convert primitive to String, call toString - StringBuilder buff = new StringBuilder(); - if (type.refCount) { - buff.append("ptr(new java_lang_StringBuilder("); - } else { - buff.append("(new java_lang_StringBuilder("); - } - buff.append(convertToString(left)); - buff.append("))->append("); - buff.append(convertToString(right)); - buff.append(")->toString()"); - return buff.toString(); - } - } - return "(" + left.asString() + " " + op + " " + right.asString() + ")"; - } - - private String convertToString(Expr e) { - Type t = e.getType(); - if (t.arrayLevel > 0) { - return e.toString() + "->toString()"; - } - if (t.classObj.isPrimitive) { - ClassObj wrapper = context.getWrapper(t.classObj); - return JavaParser.toC(wrapper + ".toString") + "(" + e.asString() + ")"; - } else if (e.getType().asString().equals("java_lang_String*")) { - return e.asString(); - } - return e.asString() + "->toString()"; - } - - private static boolean isComparison(String op) { - return op.equals("==") || op.equals(">") || op.equals("<") || - op.equals(">=") || op.equals("<=") || op.equals("!="); - } - - @Override - public Type getType() { - if (left == null) { - return right.getType(); - } - if (right == null) { - return left.getType(); - } - if (isComparison(op)) { - Type t = new Type(); - t.classObj = JavaParser.getBuiltInClass("boolean"); - return t; - } - if (op.equals("+")) { - if (left.getType().isObject() || right.getType().isObject()) { - Type t = new Type(); - t.classObj = context.getClassObj("java.lang.String"); - return t; - } - } - Type lt = left.getType(); - Type rt = right.getType(); - if (lt.classObj.primitiveType < rt.classObj.primitiveType) { - return rt; - } - return lt; - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * A "new" expression. - */ -class NewExpr extends ExprBase { - - /** - * The class. - */ - ClassObj classObj; - - /** - * The constructor parameters (for objects). - */ - final ArrayList args = new ArrayList<>(); - - /** - * The array bounds (for arrays). - */ - final ArrayList arrayInitExpr = new ArrayList<>(); - - /** - * The type. - */ - Type type; - - @Override - public String asString() { - boolean refCount = type.refCount; - StringBuilder buff = new StringBuilder(); - if (!arrayInitExpr.isEmpty()) { - if (refCount) { - if (classObj.isPrimitive) { - buff.append("ptr< array< " + classObj + " > >"); - } else { - buff.append("ptr< array< ptr< " + classObj + " > > >"); - } - } - if (classObj.isPrimitive) { - buff.append("(new array< " + classObj + " >(1 "); - } else { - if (refCount) { - buff.append("(new array< ptr< " + classObj + " > >(1 "); - } else { - buff.append("(new array< " + classObj + "* >(1 "); - } - } - for (Expr e : arrayInitExpr) { - buff.append("* ").append(e.asString()); - } - buff.append("))"); - } else { - if (refCount) { - buff.append("ptr< " + classObj + " >"); - } - buff.append("(new " + classObj); - buff.append("("); - int i = 0; - for (Expr a : args) { - if (i++ > 0) { - buff.append(", "); - } - buff.append(a.asString()); - } - buff.append("))"); - } - return buff.toString(); - } - - @Override - public Type getType() { - Type t = new Type(); - t.classObj = classObj; - t.arrayLevel = arrayInitExpr.size(); - return t; - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * A String literal. - */ -class StringExpr extends ExprBase { - - /** - * The constant name. - */ - String constantName; - - /** - * The literal. - */ - String text; - - private final JavaParser context; - private Type type; - - StringExpr(JavaParser context) { - this.context = context; - } - - @Override - public String asString() { - return constantName; - } - - @Override - public Type getType() { - if (type == null) { - type = new Type(); - type.classObj = context.getClassObj("java.lang.String"); - } - return type; - } - - /** - * Encode the String to Java syntax. - * - * @param s the string - * @return the encoded string - */ - static String javaEncode(String s) { - StringBuilder buff = new StringBuilder(s.length()); - for (int i = 0; i < s.length(); i++) { - char c = s.charAt(i); - switch (c) { - case '\t': - // HT horizontal tab - buff.append("\\t"); - break; - case '\n': - // LF linefeed - buff.append("\\n"); - break; - case '\f': - // FF form feed - buff.append("\\f"); - break; - case '\r': - // CR carriage return - buff.append("\\r"); - break; - case '"': - // double quote - buff.append("\\\""); - break; - case '\\': - // backslash - buff.append("\\\\"); - break; - default: - int ch = c & 0xffff; - if (ch >= ' ' && (ch < 0x80)) { - buff.append(c); - // not supported in properties files - // } else if(ch < 0xff) { - // buff.append("\\"); - // // make sure it's three characters (0x200 is octal 1000) - // buff.append(Integer.toOctalString(0x200 | ch).substring(1)); - } else { - buff.append("\\u"); - // make sure it's four characters - buff.append(Integer.toHexString(0x10000 | ch).substring(1)); - } - } - } - return buff.toString(); - } - - @Override - public void setType(Type type) { - // ignore - } - -} - -/** - * A variable. - */ -class VariableExpr extends ExprBase { - - /** - * The variable name. - */ - String name; - - /** - * The base expression (the first element in a.b variables). - */ - Expr base; - - /** - * The field. - */ - FieldObj field; - - private Type type; - private final JavaParser context; - - VariableExpr(JavaParser context) { - this.context = context; - } - - @Override - public String asString() { - init(); - StringBuilder buff = new StringBuilder(); - if (base != null) { - buff.append(base.asString()).append("->"); - } - if (field != null) { - if (field.isStatic) { - buff.append(JavaParser.toC(field.declaredClass + "." + field.name)); - } else if (field.name != null) { - buff.append(field.name); - } else if ("length".equals(name) && base.getType().arrayLevel > 0) { - buff.append("length()"); - } - } else { - buff.append(JavaParser.toC(name)); - } - return buff.toString(); - } - - private void init() { - if (field == null) { - Type t = base.getType(); - if (t.arrayLevel > 0) { - if ("length".equals(name)) { - field = new FieldObj(); - field.type = context.getClassObj("int").baseType; - } else { - throw new IllegalArgumentException("Unknown array method: " + name); - } - } else { - field = t.classObj.getField(name); - } - } - } - - @Override - public Type getType() { - init(); - return field.type; - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * An array initializer expression. - */ -class ArrayInitExpr extends ExprBase { - - /** - * The expression list. - */ - final ArrayList list = new ArrayList<>(); - - /** - * The type. - */ - Type type; - - @Override - public Type getType() { - return type; - } - - @Override - public String asString() { - StringBuilder buff = new StringBuilder("{ "); - int i = 0; - for (Expr e : list) { - if (i++ > 0) { - buff.append(", "); - } - buff.append(e.toString()); - } - buff.append(" }"); - return buff.toString(); - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * A type cast expression. - */ -class CastExpr extends ExprBase { - - /** - * The expression. - */ - Expr expr; - - /** - * The cast type. - */ - Type type; - - @Override - public Type getType() { - return type; - } - - @Override - public String asString() { - return "(" + type.asString() + ") " + expr.asString(); - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} - -/** - * An array access expression (get or set). - */ -class ArrayAccessExpr extends ExprBase { - - /** - * The base expression. - */ - Expr base; - - /** - * The index. - */ - Expr index; - - /** - * The type. - */ - Type type; - - @Override - public Type getType() { - Type t = new Type(); - t.classObj = base.getType().classObj; - t.arrayLevel = base.getType().arrayLevel - 1; - return t; - } - - @Override - public String asString() { - return base.asString() + "->at(" + index.asString() + ")"; - } - - @Override - public void setType(Type type) { - this.type = type; - } - -} diff --git a/h2/src/tools/org/h2/java/Ignore.java b/h2/src/tools/org/h2/java/Ignore.java deleted file mode 100644 index 1ed8d3708f..0000000000 --- a/h2/src/tools/org/h2/java/Ignore.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -/** - * This annotation marks methods that are only needed for testing. - */ -public @interface Ignore { - // empty -} diff --git a/h2/src/tools/org/h2/java/JavaParser.java b/h2/src/tools/org/h2/java/JavaParser.java deleted file mode 100644 index 9eadb1ddae..0000000000 --- a/h2/src/tools/org/h2/java/JavaParser.java +++ /dev/null @@ -1,1848 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.RandomAccessFile; -import java.nio.charset.StandardCharsets; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; - -/** - * Converts Java to C. - */ -public class JavaParser { - - /** - * Whether ref-counting is used. - */ - public static final boolean REF_COUNT = false; - - /** - * Whether ref-counting is used for constants. - */ - public static final boolean REF_COUNT_STATIC = false; - - private static final HashMap BUILT_IN_CLASSES = new HashMap<>(); - - private static final int TOKEN_LITERAL_CHAR = 0; - private static final int TOKEN_LITERAL_STRING = 1; - private static final int TOKEN_LITERAL_NUMBER = 2; - private static final int TOKEN_RESERVED = 3; - private static final int TOKEN_IDENTIFIER = 4; - private static final int TOKEN_OTHER = 5; - - private static final HashSet RESERVED = new HashSet<>(); - private static final HashMap JAVA_IMPORT_MAP = new HashMap<>(); - - private final ArrayList allClasses = new ArrayList<>(); - - private String source; - - private ParseState current = new ParseState(); - - private String packageName; - private ClassObj classObj; - private int nextClassId; - private MethodObj method; - private FieldObj thisPointer; - private final HashMap importMap = new HashMap<>(); - private final HashMap classes = new HashMap<>(); - private final LinkedHashMap localVars = - new LinkedHashMap<>(); - private final HashMap allMethodsMap = new HashMap<>(); - private final ArrayList nativeHeaders = new ArrayList<>(); - private final HashMap stringToStringConstantMap = new HashMap<>(); - private final HashMap stringConstantToStringMap = new HashMap<>(); - - public JavaParser() { - addBuiltInTypes(); - } - - private void addBuiltInTypes() { - String[] list = { "abstract", "continue", "for", "new", "switch", - "assert", "default", "if", "package", "synchronized", - "boolean", "do", "goto", "private", "this", "break", "double", - "implements", "protected", "throw", "byte", "else", "import", - "public", "throws", "case", "enum", "instanceof", "return", - "transient", "catch", "extends", "int", "short", "try", "char", - "final", "interface", "static", "void", "class", "finally", - "long", "strictfp", "volatile", "const", "float", "native", - "super", "while", "true", "false", "null" }; - for (String s : list) { - RESERVED.add(s); - } - int id = 0; - addBuiltInType(id++, true, 0, "void"); - addBuiltInType(id++, true, 1, "boolean"); - addBuiltInType(id++, true, 2, "byte"); - addBuiltInType(id++, true, 3, "short"); - addBuiltInType(id++, true, 4, "char"); - addBuiltInType(id++, true, 5, "int"); - addBuiltInType(id++, true, 6, "long"); - addBuiltInType(id++, true, 7, "float"); - addBuiltInType(id++, true, 8, "double"); - String[] java = { "Boolean", "Byte", "Character", "Class", - "ClassLoader", "Double", "Float", "Integer", "Long", "Math", - "Number", "Object", "Runtime", "Short", "String", - "StringBuffer", "StringBuilder", "System", "Thread", - "ThreadGroup", "ThreadLocal", "Throwable", "Void" }; - for (String s : java) { - JAVA_IMPORT_MAP.put(s, "java.lang." + s); - addBuiltInType(id++, false, 0, "java.lang." + s); - } - nextClassId = id; - } - - /** - * Get the wrapper class for the given primitive class. - * - * @param c the class - * @return the wrapper class - */ - ClassObj getWrapper(ClassObj c) { - switch (c.id) { - case 1: - return getClass("java.lang.Boolean"); - case 2: - return getClass("java.lang.Byte"); - case 3: - return getClass("java.lang.Short"); - case 4: - return getClass("java.lang.Character"); - case 5: - return getClass("java.lang.Integer"); - case 6: - return getClass("java.lang.Long"); - case 7: - return getClass("java.lang.Float"); - case 8: - return getClass("java.lang.Double"); - } - throw new RuntimeException("not a primitive type: " + classObj); - } - - private void addBuiltInType(int id, boolean primitive, int primitiveType, - String type) { - ClassObj c = new ClassObj(); - c.id = id; - c.className = type; - c.isPrimitive = primitive; - c.primitiveType = primitiveType; - BUILT_IN_CLASSES.put(type, c); - addClass(c); - } - - private void addClass(ClassObj c) { - int id = c.id; - while (id >= allClasses.size()) { - allClasses.add(null); - } - allClasses.set(id, c); - } - - /** - * Parse the source code. - * - * @param baseDir the base directory - * @param className the fully qualified name of the class to parse - */ - void parse(String baseDir, String className) { - String fileName = baseDir + "/" + className.replace('.', '/') + ".java"; - current = new ParseState(); - try { - RandomAccessFile file = new RandomAccessFile(fileName, "r"); - byte[] buff = new byte[(int) file.length()]; - file.readFully(buff); - source = new String(buff, StandardCharsets.UTF_8); - file.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - source = replaceUnicode(source); - source = removeRemarks(source); - try { - readToken(); - parseCompilationUnit(); - } catch (Exception e) { - throw new RuntimeException(source.substring(0, current.index) - + "[*]" + source.substring(current.index), e); - } - } - - private static String cleanPackageName(String name) { - if (name.startsWith("org.h2.java.lang") - || name.startsWith("org.h2.java.io")) { - return name.substring("org.h2.".length()); - } - return name; - } - - private void parseCompilationUnit() { - if (readIf("package")) { - packageName = cleanPackageName(readQualifiedIdentifier()); - read(";"); - } - while (readIf("import")) { - String importPackageName = cleanPackageName(readQualifiedIdentifier()); - String importClass = importPackageName.substring(importPackageName - .lastIndexOf('.') + 1); - importMap.put(importClass, importPackageName); - read(";"); - } - while (true) { - Statement s = readNativeStatementIf(); - if (s == null) { - break; - } - nativeHeaders.add(s); - } - while (true) { - boolean isPublic = readIf("public"); - boolean isInterface; - if (readIf("class")) { - isInterface = false; - } else { - read("interface"); - isInterface = true; - } - String name = readIdentifier(); - classObj = BUILT_IN_CLASSES.get(packageName + "." + name); - if (classObj == null) { - classObj = new ClassObj(); - classObj.id = nextClassId++; - } - classObj.isPublic = isPublic; - classObj.isInterface = isInterface; - classObj.className = packageName == null ? "" : (packageName + ".") - + name; - // import this class - importMap.put(name, classObj.className); - addClass(classObj); - classes.put(classObj.className, classObj); - if (readIf("extends")) { - classObj.superClassName = readQualifiedIdentifier(); - } - if (readIf("implements")) { - while (true) { - classObj.interfaceNames.add(readQualifiedIdentifier()); - if (!readIf(",")) { - break; - } - } - } - parseClassBody(); - if (current.token == null) { - break; - } - } - } - - private boolean isTypeOrIdentifier() { - if (BUILT_IN_CLASSES.containsKey(current.token)) { - return true; - } - return current.type == TOKEN_IDENTIFIER; - } - - private ClassObj getClass(String type) { - ClassObj c = getClassIf(type); - if (c == null) { - throw new RuntimeException("Unknown type: " + type); - } - return c; - } - - /** - * Get the class for a built-in type. - * - * @param type the type - * @return the class or null if not found - */ - static ClassObj getBuiltInClass(String type) { - return BUILT_IN_CLASSES.get(type); - } - - private ClassObj getClassIf(String type) { - ClassObj c = BUILT_IN_CLASSES.get(type); - if (c != null) { - return c; - } - c = classes.get(type); - if (c != null) { - return c; - } - String mappedType = importMap.get(type); - if (mappedType == null) { - mappedType = JAVA_IMPORT_MAP.get(type); - if (mappedType == null) { - return null; - } - } - c = classes.get(mappedType); - if (c == null) { - c = BUILT_IN_CLASSES.get(mappedType); - if (c == null) { - throw new RuntimeException("Unknown class: " + mappedType); - } - } - return c; - } - - private void parseClassBody() { - read("{"); - localVars.clear(); - while (true) { - if (readIf("}")) { - break; - } - thisPointer = null; - while (true) { - Statement s = readNativeStatementIf(); - if (s == null) { - break; - } - classObj.nativeCode.add(s); - } - thisPointer = null; - HashSet annotations = new HashSet<>(); - while (readIf("@")) { - String annotation = readIdentifier(); - annotations.add(annotation); - } - boolean isIgnore = annotations.contains("Ignore"); - boolean isLocalField = annotations.contains("Local"); - boolean isStatic = false; - boolean isFinal = false; - boolean isPrivate = false; - boolean isPublic = false; - boolean isNative = false; - while (true) { - if (readIf("static")) { - isStatic = true; - } else if (readIf("final")) { - isFinal = true; - } else if (readIf("native")) { - isNative = true; - } else if (readIf("private")) { - isPrivate = true; - } else if (readIf("public")) { - isPublic = true; - } else { - break; - } - } - if (readIf("{")) { - method = new MethodObj(); - method.isIgnore = isIgnore; - method.name = isStatic ? "cl_init_obj" : ""; - method.isStatic = isStatic; - localVars.clear(); - if (!isStatic) { - initThisPointer(); - } - method.block = readStatement(); - classObj.addMethod(method); - } else { - String typeName = readTypeOrIdentifier(); - Type type = readType(typeName); - method = new MethodObj(); - method.isIgnore = isIgnore; - method.returnType = type; - method.isStatic = isStatic; - method.isFinal = isFinal; - method.isPublic = isPublic; - method.isPrivate = isPrivate; - method.isNative = isNative; - localVars.clear(); - if (!isStatic) { - initThisPointer(); - } - if (readIf("(")) { - if (type.classObj != classObj) { - throw getSyntaxException("Constructor of wrong type: " - + type); - } - method.name = ""; - method.isConstructor = true; - parseFormalParameters(method); - if (!readIf(";")) { - method.block = readStatement(); - } - classObj.addMethod(method); - addMethod(method); - } else { - String name = readIdentifier(); - if (name.endsWith("Method")) { - name = name.substring(0, - name.length() - "Method".length()); - } - method.name = name; - if (readIf("(")) { - parseFormalParameters(method); - if (!readIf(";")) { - method.block = readStatement(); - } - classObj.addMethod(method); - addMethod(method); - } else { - FieldObj field = new FieldObj(); - field.isIgnore = isIgnore; - field.isLocalField = isLocalField; - field.type = type; - field.name = name; - field.isStatic = isStatic; - field.isFinal = isFinal; - field.isPublic = isPublic; - field.isPrivate = isPrivate; - field.declaredClass = classObj; - if (readIf("=")) { - if (field.type.arrayLevel > 0 && readIf("{")) { - field.value = readArrayInit(field.type); - } else { - field.value = readExpr(); - } - } else { - field.value = field.type.getDefaultValue(this); - } - read(";"); - if (isStatic) { - classObj.addStaticField(field); - } else { - classObj.addInstanceField(field); - } - } - } - } - } - } - - private void addMethod(MethodObj m) { - if (m.isStatic) { - return; - } - MethodObj old = allMethodsMap.get(m.name); - if (old != null) { - old.isVirtual = true; - m.isVirtual = true; - } else { - allMethodsMap.put(m.name, m); - } - } - - private Expr readArrayInit(Type type) { - ArrayInitExpr expr = new ArrayInitExpr(); - expr.type = new Type(); - expr.type.classObj = type.classObj; - expr.type.arrayLevel = type.arrayLevel - 1; - if (!readIf("}")) { - while (true) { - expr.list.add(readExpr()); - if (readIf("}")) { - break; - } - read(","); - if (readIf("}")) { - break; - } - } - } - return expr; - } - - private void initThisPointer() { - thisPointer = new FieldObj(); - thisPointer.isVariable = true; - thisPointer.name = "this"; - thisPointer.type = new Type(); - thisPointer.type.classObj = classObj; - } - - private Type readType(String name) { - Type type = new Type(); - type.classObj = getClass(name); - while (readIf("[")) { - read("]"); - type.arrayLevel++; - } - if (readIf("...")) { - type.arrayLevel++; - type.isVarArgs = true; - } - return type; - } - - private void parseFormalParameters(MethodObj methodObj) { - if (readIf(")")) { - return; - } - while (true) { - FieldObj field = new FieldObj(); - field.isVariable = true; - String typeName = readTypeOrIdentifier(); - field.type = readType(typeName); - if (field.type.isVarArgs) { - methodObj.isVarArgs = true; - } - field.name = readIdentifier(); - methodObj.parameters.put(field.name, field); - if (readIf(")")) { - break; - } - read(","); - } - } - - private String readTypeOrIdentifier() { - if (current.type == TOKEN_RESERVED) { - if (BUILT_IN_CLASSES.containsKey(current.token)) { - return read(); - } - } - String s = readIdentifier(); - while (readIf(".")) { - s += "." + readIdentifier(); - } - return s; - } - - private Statement readNativeStatementIf() { - if (readIf("//")) { - boolean isC = readIdentifierIf("c"); - int start = current.index; - while (source.charAt(current.index) != '\n') { - current.index++; - } - String s = source.substring(start, current.index).trim(); - StatementNative stat = new StatementNative(s); - read(); - return isC ? stat : null; - } else if (readIf("/*")) { - boolean isC = readIdentifierIf("c"); - int start = current.index; - while (source.charAt(current.index) != '*' - || source.charAt(current.index + 1) != '/') { - current.index++; - } - String s = source.substring(start, current.index).trim(); - StatementNative stat = new StatementNative(s); - current.index += 2; - read(); - return isC ? stat : null; - } - return null; - } - - private Statement readStatement() { - Statement s = readNativeStatementIf(); - if (s != null) { - return s; - } - if (readIf(";")) { - return new EmptyStatement(); - } else if (readIf("{")) { - StatementBlock stat = new StatementBlock(); - while (true) { - if (readIf("}")) { - break; - } - stat.instructions.add(readStatement()); - } - return stat; - } else if (readIf("if")) { - IfStatement ifStat = new IfStatement(); - read("("); - ifStat.condition = readExpr(); - read(")"); - ifStat.block = readStatement(); - if (readIf("else")) { - ifStat.elseBlock = readStatement(); - } - return ifStat; - } else if (readIf("while")) { - WhileStatement whileStat = new WhileStatement(); - read("("); - whileStat.condition = readExpr(); - read(")"); - whileStat.block = readStatement(); - return whileStat; - } else if (readIf("break")) { - read(";"); - return new BreakStatement(); - } else if (readIf("continue")) { - read(";"); - return new ContinueStatement(); - } else if (readIf("switch")) { - - read("("); - SwitchStatement switchStat = new SwitchStatement(readExpr()); - read(")"); - read("{"); - while (true) { - if (readIf("default")) { - read(":"); - StatementBlock block = new StatementBlock(); - switchStat.setDefaultBlock(block); - while (true) { - block.instructions.add(readStatement()); - if (current.token.equals("case") - || current.token.equals("default") - || current.token.equals("}")) { - break; - } - } - } else if (readIf("case")) { - Expr expr = readExpr(); - read(":"); - StatementBlock block = new StatementBlock(); - while (true) { - block.instructions.add(readStatement()); - if (current.token.equals("case") - || current.token.equals("default") - || current.token.equals("}")) { - break; - } - } - switchStat.addCase(expr, block); - } else if (readIf("}")) { - break; - } - } - return switchStat; - } else if (readIf("for")) { - ForStatement forStat = new ForStatement(); - read("("); - ParseState back = copyParseState(); - try { - String typeName = readTypeOrIdentifier(); - Type type = readType(typeName); - String name = readIdentifier(); - FieldObj f = new FieldObj(); - f.name = name; - f.type = type; - f.isVariable = true; - localVars.put(name, f); - read(":"); - forStat.iterableType = type; - forStat.iterableVariable = name; - forStat.iterable = readExpr(); - } catch (Exception e) { - current = back; - forStat.init = readStatement(); - forStat.condition = readExpr(); - read(";"); - do { - forStat.updates.add(readExpr()); - } while (readIf(",")); - } - read(")"); - forStat.block = readStatement(); - return forStat; - } else if (readIf("do")) { - DoWhileStatement doWhileStat = new DoWhileStatement(); - doWhileStat.block = readStatement(); - read("while"); - read("("); - doWhileStat.condition = readExpr(); - read(")"); - read(";"); - return doWhileStat; - } else if (readIf("return")) { - ReturnStatement returnStat = new ReturnStatement(); - if (!readIf(";")) { - returnStat.expr = readExpr(); - read(";"); - } - return returnStat; - } else { - if (isTypeOrIdentifier()) { - ParseState start = copyParseState(); - String name = readTypeOrIdentifier(); - ClassObj c = getClassIf(name); - if (c != null) { - VarDecStatement dec = new VarDecStatement(); - dec.type = readType(name); - while (true) { - String varName = readIdentifier(); - Expr value = null; - if (readIf("=")) { - if (dec.type.arrayLevel > 0 && readIf("{")) { - value = readArrayInit(dec.type); - } else { - value = readExpr(); - } - } - FieldObj f = new FieldObj(); - f.isVariable = true; - f.type = dec.type; - f.name = varName; - localVars.put(varName, f); - dec.addVariable(varName, value); - if (readIf(";")) { - break; - } - read(","); - } - return dec; - } - current = start; - // ExprStatement - } - ExprStatement stat = new ExprStatement(readExpr()); - read(";"); - return stat; - } - } - - private ParseState copyParseState() { - ParseState state = new ParseState(); - state.index = current.index; - state.line = current.line; - state.token = current.token; - state.type = current.type; - return state; - } - - private Expr readExpr() { - Expr expr = readExpr1(); - String assign = current.token; - if (readIf("=") || readIf("+=") || readIf("-=") || readIf("*=") - || readIf("/=") || readIf("&=") || readIf("|=") || readIf("^=") - || readIf("%=") || readIf("<<=") || readIf(">>=") - || readIf(">>>=")) { - AssignExpr assignOp = new AssignExpr(); - assignOp.left = expr; - assignOp.op = assign; - assignOp.right = readExpr1(); - expr = assignOp; - } - return expr; - } - - private Expr readExpr1() { - Expr expr = readExpr2(); - if (readIf("?")) { - ConditionalExpr ce = new ConditionalExpr(); - ce.condition = expr; - ce.ifTrue = readExpr(); - read(":"); - ce.ifFalse = readExpr(); - return ce; - } - return expr; - } - - private Expr readExpr2() { - Expr expr = readExpr2a(); - while (true) { - String infixOp = current.token; - if (readIf("||")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2a(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2a() { - Expr expr = readExpr2b(); - while (true) { - String infixOp = current.token; - if (readIf("&&")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2b(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2b() { - Expr expr = readExpr2c(); - while (true) { - String infixOp = current.token; - if (readIf("|")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2c(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2c() { - Expr expr = readExpr2d(); - while (true) { - String infixOp = current.token; - if (readIf("^")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2d(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2d() { - Expr expr = readExpr2e(); - while (true) { - String infixOp = current.token; - if (readIf("&")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2e(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2e() { - Expr expr = readExpr2f(); - while (true) { - String infixOp = current.token; - if (readIf("==") || readIf("!=")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2f(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2f() { - Expr expr = readExpr2g(); - while (true) { - String infixOp = current.token; - if (readIf("<") || readIf(">") || readIf("<=") || readIf(">=")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2g(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2g() { - Expr expr = readExpr2h(); - while (true) { - String infixOp = current.token; - if (readIf("<<") || readIf(">>") || readIf(">>>")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2h(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2h() { - Expr expr = readExpr2i(); - while (true) { - String infixOp = current.token; - if (readIf("+") || readIf("-")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr2i(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr2i() { - Expr expr = readExpr3(); - while (true) { - String infixOp = current.token; - if (readIf("*") || readIf("/") || readIf("%")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = infixOp; - opExpr.right = readExpr3(); - expr = opExpr; - } else { - break; - } - } - return expr; - } - - private Expr readExpr3() { - if (readIf("(")) { - if (isTypeOrIdentifier()) { - ParseState start = copyParseState(); - String name = readTypeOrIdentifier(); - ClassObj c = getClassIf(name); - if (c != null) { - read(")"); - CastExpr expr = new CastExpr(); - expr.type = new Type(); - expr.type.classObj = c; - expr.expr = readExpr(); - return expr; - } - current = start; - } - Expr expr = readExpr(); - read(")"); - return expr; - } - String prefix = current.token; - if (readIf("++") || readIf("--") || readIf("!") || readIf("~") - || readIf("+") || readIf("-")) { - OpExpr expr = new OpExpr(this); - expr.op = prefix; - expr.right = readExpr3(); - return expr; - } - Expr expr = readExpr4(); - String suffix = current.token; - if (readIf("++") || readIf("--")) { - OpExpr opExpr = new OpExpr(this); - opExpr.left = expr; - opExpr.op = suffix; - expr = opExpr; - } - return expr; - } - - private Expr readExpr4() { - if (readIf("false")) { - LiteralExpr expr = new LiteralExpr(this, "boolean"); - expr.literal = "false"; - return expr; - } else if (readIf("true")) { - LiteralExpr expr = new LiteralExpr(this, "boolean"); - expr.literal = "true"; - return expr; - } else if (readIf("null")) { - LiteralExpr expr = new LiteralExpr(this, "java.lang.Object"); - expr.literal = "null"; - return expr; - } else if (current.type == TOKEN_LITERAL_NUMBER) { - // TODO or long, float, double - LiteralExpr expr = new LiteralExpr(this, "int"); - expr.literal = current.token.substring(1); - readToken(); - return expr; - } else if (current.type == TOKEN_LITERAL_CHAR) { - LiteralExpr expr = new LiteralExpr(this, "char"); - expr.literal = current.token + "'"; - readToken(); - return expr; - } else if (current.type == TOKEN_LITERAL_STRING) { - String text = current.token.substring(1); - StringExpr expr = getStringConstant(text); - readToken(); - return expr; - } - Expr expr; - expr = readExpr5(); - while (true) { - if (readIf(".")) { - String n = readIdentifier(); - if (readIf("(")) { - CallExpr e2 = new CallExpr(this, expr, null, n); - if (!readIf(")")) { - while (true) { - e2.args.add(readExpr()); - if (!readIf(",")) { - read(")"); - break; - } - } - } - expr = e2; - } else { - VariableExpr e2 = new VariableExpr(this); - e2.base = expr; - expr = e2; - e2.name = n; - } - } else if (readIf("[")) { - ArrayAccessExpr arrayExpr = new ArrayAccessExpr(); - arrayExpr.base = expr; - arrayExpr.index = readExpr(); - read("]"); - return arrayExpr; - } else { - break; - } - } - return expr; - } - - private StringExpr getStringConstant(String s) { - String c = stringToStringConstantMap.get(s); - if (c == null) { - StringBuilder buff = new StringBuilder(); - for (int i = 0; i < s.length() && i < 16; i++) { - char ch = s.charAt(i); - if (ch >= 'a' && ch <= 'z') { - // don't use Character.toUpperCase - // to avoid locale problems - // (the uppercase of 'i' is not always 'I') - buff.append((char) (ch + 'A' - 'a')); - } else if (ch >= 'A' && ch <= 'Z') { - buff.append(ch); - } else if (ch == '_' || ch == ' ') { - buff.append('_'); - } - } - c = buff.toString(); - if (c.length() == 0 || stringConstantToStringMap.containsKey(c)) { - if (c.length() == 0) { - c = "X"; - } - int i = 2; - for (;; i++) { - String c2 = c + "_" + i; - if (!stringConstantToStringMap.containsKey(c2)) { - c = c2; - break; - } - } - } - c = "STRING_" + c; - stringToStringConstantMap.put(s, c); - stringConstantToStringMap.put(c, s); - } - StringExpr expr = new StringExpr(this); - expr.text = s; - expr.constantName = c; - return expr; - } - - private Expr readExpr5() { - if (readIf("new")) { - NewExpr expr = new NewExpr(); - String typeName = readTypeOrIdentifier(); - expr.classObj = getClass(typeName); - if (readIf("(")) { - if (!readIf(")")) { - while (true) { - expr.args.add(readExpr()); - if (!readIf(",")) { - read(")"); - break; - } - } - } - } else { - while (readIf("[")) { - expr.arrayInitExpr.add(readExpr()); - read("]"); - } - } - return expr; - } - if (readIf("this")) { - VariableExpr expr = new VariableExpr(this); - if (thisPointer == null) { - throw getSyntaxException("'this' used in a static context"); - } - expr.field = thisPointer; - return expr; - } - String name = readIdentifier(); - if (readIf("(")) { - VariableExpr t; - if (thisPointer == null) { - // static method calling another static method - t = null; - } else { - // non-static method calling a static or non-static method - t = new VariableExpr(this); - t.field = thisPointer; - } - CallExpr expr = new CallExpr(this, t, classObj.className, name); - if (!readIf(")")) { - while (true) { - expr.args.add(readExpr()); - if (!readIf(",")) { - read(")"); - break; - } - } - } - return expr; - } - VariableExpr expr = new VariableExpr(this); - FieldObj f = localVars.get(name); - if (f == null) { - f = method.parameters.get(name); - } - if (f == null) { - f = classObj.staticFields.get(name); - } - if (f == null) { - f = classObj.instanceFields.get(name); - } - if (f == null) { - String imp = importMap.get(name); - if (imp == null) { - imp = JAVA_IMPORT_MAP.get(name); - } - if (imp != null) { - name = imp; - if (readIf(".")) { - String n = readIdentifier(); - if (readIf("(")) { - CallExpr e2 = new CallExpr(this, null, imp, n); - if (!readIf(")")) { - while (true) { - e2.args.add(readExpr()); - if (!readIf(",")) { - read(")"); - break; - } - } - } - return e2; - } - VariableExpr e2 = new VariableExpr(this); - // static member variable - e2.name = imp + "." + n; - ClassObj c = classes.get(imp); - FieldObj sf = c.staticFields.get(n); - e2.field = sf; - return e2; - } - // TODO static field or method of a class - } - } - expr.field = f; - if (f != null && (!f.isVariable && !f.isStatic)) { - VariableExpr ve = new VariableExpr(this); - ve.field = thisPointer; - expr.base = ve; - if (thisPointer == null) { - throw getSyntaxException("'this' used in a static context"); - } - } - expr.name = name; - return expr; - } - - private void read(String string) { - if (!readIf(string)) { - throw getSyntaxException(string + " expected, got " + current.token); - } - } - - private String readQualifiedIdentifier() { - String id = readIdentifier(); - if (localVars.containsKey(id)) { - return id; - } - if (classObj != null) { - if (classObj.staticFields.containsKey(id)) { - return id; - } - if (classObj.instanceFields.containsKey(id)) { - return id; - } - } - String fullName = importMap.get(id); - if (fullName != null) { - return fullName; - } - while (readIf(".")) { - id += "." + readIdentifier(); - } - return id; - } - - private String readIdentifier() { - if (current.type != TOKEN_IDENTIFIER) { - throw getSyntaxException("identifier expected, got " - + current.token); - } - String result = current.token; - readToken(); - return result; - } - - private boolean readIdentifierIf(String token) { - if (current.type == TOKEN_IDENTIFIER && token.equals(current.token)) { - readToken(); - return true; - } - return false; - } - - private boolean readIf(String token) { - if (current.type != TOKEN_IDENTIFIER && token.equals(current.token)) { - readToken(); - return true; - } - return false; - } - - private String read() { - String token = current.token; - readToken(); - return token; - } - - private RuntimeException getSyntaxException(String message) { - return new RuntimeException(message, new ParseException(source, - current.index)); - } - - /** - * Replace all Unicode escapes. - * - * @param s the text - * @return the cleaned text - */ - static String replaceUnicode(String s) { - if (s.indexOf("\\u") < 0) { - return s; - } - StringBuilder buff = new StringBuilder(s.length()); - for (int i = 0; i < s.length(); i++) { - if (s.substring(i).startsWith("\\\\")) { - buff.append("\\\\"); - i++; - } else if (s.substring(i).startsWith("\\u")) { - i += 2; - while (s.charAt(i) == 'u') { - i++; - } - String c = s.substring(i, i + 4); - buff.append((char) Integer.parseInt(c, 16)); - i += 4; - } else { - buff.append(s.charAt(i)); - } - } - return buff.toString(); - } - - /** - * Replace all Unicode escapes and remove all remarks. - * - * @param s the source code - * @return the cleaned source code - */ - static String removeRemarks(String s) { - char[] chars = s.toCharArray(); - for (int i = 0; i >= 0 && i < s.length(); i++) { - if (s.charAt(i) == '\'') { - i++; - while (true) { - if (s.charAt(i) == '\\') { - i++; - } else if (s.charAt(i) == '\'') { - break; - } - i++; - } - continue; - } else if (s.charAt(i) == '\"') { - i++; - while (true) { - if (s.charAt(i) == '\\') { - i++; - } else if (s.charAt(i) == '\"') { - break; - } - i++; - } - continue; - } - String sub = s.substring(i); - if (sub.startsWith("/*") && !sub.startsWith("/* c:")) { - int j = i; - i = s.indexOf("*/", i + 2) + 2; - for (; j < i; j++) { - if (chars[j] > ' ') { - chars[j] = ' '; - } - } - } else if (sub.startsWith("//") && !sub.startsWith("// c:")) { - int j = i; - i = s.indexOf('\n', i); - while (j < i) { - chars[j++] = ' '; - } - } - } - return new String(chars) + " "; - } - - private void readToken() { - int ch; - while (true) { - if (current.index >= source.length()) { - current.token = null; - return; - } - ch = source.charAt(current.index); - if (ch == '\n') { - current.line++; - } else if (ch > ' ') { - break; - } - current.index++; - } - int start = current.index; - if (Character.isJavaIdentifierStart(ch)) { - while (Character.isJavaIdentifierPart(source.charAt(current.index))) { - current.index++; - } - current.token = source.substring(start, current.index); - if (RESERVED.contains(current.token)) { - current.type = TOKEN_RESERVED; - } else { - current.type = TOKEN_IDENTIFIER; - } - return; - } else if (Character.isDigit(ch) - || (ch == '.' && Character.isDigit(source - .charAt(current.index + 1)))) { - String s = source.substring(current.index); - current.token = "0" + readNumber(s); - current.index += current.token.length() - 1; - current.type = TOKEN_LITERAL_NUMBER; - return; - } - current.index++; - switch (ch) { - case '\'': { - while (true) { - if (source.charAt(current.index) == '\\') { - current.index++; - } else if (source.charAt(current.index) == '\'') { - break; - } - current.index++; - } - current.index++; - current.token = source.substring(start + 1, current.index); - current.token = "\'" + javaDecode(current.token, '\''); - current.type = TOKEN_LITERAL_CHAR; - return; - } - case '\"': { - while (true) { - if (source.charAt(current.index) == '\\') { - current.index++; - } else if (source.charAt(current.index) == '\"') { - break; - } - current.index++; - } - current.index++; - current.token = source.substring(start + 1, current.index); - current.token = "\"" + javaDecode(current.token, '\"'); - current.type = TOKEN_LITERAL_STRING; - return; - } - case '(': - case ')': - case '[': - case ']': - case '{': - case '}': - case ';': - case ',': - case '?': - case ':': - case '@': - break; - case '.': - if (source.charAt(current.index) == '.' - && source.charAt(current.index + 1) == '.') { - current.index += 2; - } - break; - case '+': - if (source.charAt(current.index) == '=' - || source.charAt(current.index) == '+') { - current.index++; - } - break; - case '-': - if (source.charAt(current.index) == '=' - || source.charAt(current.index) == '-') { - current.index++; - } - break; - case '>': - if (source.charAt(current.index) == '>') { - current.index++; - if (source.charAt(current.index) == '>') { - current.index++; - } - } - if (source.charAt(current.index) == '=') { - current.index++; - } - break; - case '<': - if (source.charAt(current.index) == '<') { - current.index++; - } - if (source.charAt(current.index) == '=') { - current.index++; - } - break; - case '/': - if (source.charAt(current.index) == '*' - || source.charAt(current.index) == '/' - || source.charAt(current.index) == '=') { - current.index++; - } - break; - case '*': - case '~': - case '!': - case '=': - case '%': - case '^': - if (source.charAt(current.index) == '=') { - current.index++; - } - break; - case '&': - if (source.charAt(current.index) == '&') { - current.index++; - } else if (source.charAt(current.index) == '=') { - current.index++; - } - break; - case '|': - if (source.charAt(current.index) == '|') { - current.index++; - } else if (source.charAt(current.index) == '=') { - current.index++; - } - break; - } - current.type = TOKEN_OTHER; - current.token = source.substring(start, current.index); - } - - /** - * Parse a number literal and returns it. - * - * @param s the source code - * @return the number - */ - static String readNumber(String s) { - int i = 0; - if (s.startsWith("0x") || s.startsWith("0X")) { - i = 2; - while (true) { - char ch = s.charAt(i); - if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f') - && (ch < 'A' || ch > 'F')) { - break; - } - i++; - } - if (s.charAt(i) == 'l' || s.charAt(i) == 'L') { - i++; - } - } else { - while (true) { - char ch = s.charAt(i); - if ((ch < '0' || ch > '9') && ch != '.') { - break; - } - i++; - } - if (s.charAt(i) == 'e' || s.charAt(i) == 'E') { - i++; - if (s.charAt(i) == '-' || s.charAt(i) == '+') { - i++; - } - while (Character.isDigit(s.charAt(i))) { - i++; - } - } - if (s.charAt(i) == 'f' || s.charAt(i) == 'F' || s.charAt(i) == 'd' - || s.charAt(i) == 'D' || s.charAt(i) == 'L' - || s.charAt(i) == 'l') { - i++; - } - } - return s.substring(0, i); - } - - private static RuntimeException getFormatException(String s, int i) { - return new RuntimeException(new ParseException(s, i)); - } - - private static String javaDecode(String s, char end) { - StringBuilder buff = new StringBuilder(s.length()); - for (int i = 0; i < s.length(); i++) { - char c = s.charAt(i); - if (c == end) { - break; - } else if (c == '\\') { - if (i >= s.length()) { - throw getFormatException(s, s.length() - 1); - } - c = s.charAt(++i); - switch (c) { - case 't': - buff.append('\t'); - break; - case 'r': - buff.append('\r'); - break; - case 'n': - buff.append('\n'); - break; - case 'b': - buff.append('\b'); - break; - case 'f': - buff.append('\f'); - break; - case '"': - buff.append('"'); - break; - case '\'': - buff.append('\''); - break; - case '\\': - buff.append('\\'); - break; - case 'u': { - try { - c = (char) (Integer.parseInt(s.substring(i + 1, i + 5), - 16)); - } catch (NumberFormatException e) { - throw getFormatException(s, i); - } - i += 4; - buff.append(c); - break; - } - default: - if (c >= '0' && c <= '9') { - try { - c = (char) (Integer.parseInt(s.substring(i, i + 3), - 8)); - } catch (NumberFormatException e) { - throw getFormatException(s, i); - } - i += 2; - buff.append(c); - } else { - throw getFormatException(s, i); - } - } - } else { - buff.append(c); - } - } - return buff.toString(); - } - - /** - * Write the C++ header. - * - * @param out the output writer - */ - void writeHeader(PrintWriter out) { - for (Statement s : nativeHeaders) { - out.println(s.asString()); - } - if (JavaParser.REF_COUNT_STATIC) { - out.println("#define STRING(s) STRING_REF(s)"); - } else { - out.println("#define STRING(s) STRING_PTR(s)"); - } - out.println(); - for (ClassObj c : classes.values()) { - out.println("class " + toC(c.className) + ";"); - } - for (ClassObj c : classes.values()) { - for (FieldObj f : c.staticFields.values()) { - StringBuilder buff = new StringBuilder(); - buff.append("extern "); - if (f.isFinal) { - buff.append("const "); - } - buff.append(f.type.asString()); - buff.append(" ").append(toC(c.className + "." + f.name)); - buff.append(";"); - out.println(buff.toString()); - } - for (ArrayList list : c.methods.values()) { - for (MethodObj m : list) { - if (m.isIgnore) { - continue; - } - if (m.isStatic) { - out.print(m.returnType.asString()); - out.print(" " + toC(c.className + "_" + m.name) + "("); - int i = 0; - for (FieldObj p : m.parameters.values()) { - if (i > 0) { - out.print(", "); - } - out.print(p.type.asString() + " " + p.name); - i++; - } - out.println(");"); - } - } - } - out.print("class " + toC(c.className) + " : public "); - if (c.superClassName == null) { - if (c.className.equals("java.lang.Object")) { - out.print("RefBase"); - } else { - out.print("java_lang_Object"); - } - } else { - out.print(toC(c.superClassName)); - } - out.println(" {"); - out.println("public:"); - for (FieldObj f : c.instanceFields.values()) { - out.print(" "); - out.print(f.type.asString() + " " + f.name); - out.println(";"); - } - out.println("public:"); - for (ArrayList list : c.methods.values()) { - for (MethodObj m : list) { - if (m.isIgnore) { - continue; - } - if (m.isStatic) { - continue; - } - if (m.isConstructor) { - out.print(" " + toC(c.className) + "("); - } else { - out.print(" " + m.returnType.asString() + " " - + m.name + "("); - } - int i = 0; - for (FieldObj p : m.parameters.values()) { - if (i > 0) { - out.print(", "); - } - out.print(p.type.asString()); - out.print(" " + p.name); - i++; - } - out.println(");"); - } - } - out.println("};"); - } - ArrayList constantNames = new ArrayList<>(stringConstantToStringMap.keySet()); - Collections.sort(constantNames); - for (String c : constantNames) { - String s = stringConstantToStringMap.get(c); - if (JavaParser.REF_COUNT_STATIC) { - out.println("ptr " + c + " = STRING(L\"" + s - + "\");"); - } else { - out.println("java_lang_String* " + c + " = STRING(L\"" + s - + "\");"); - } - } - } - - /** - * Write the C++ source code. - * - * @param out the output writer - */ - void writeSource(PrintWriter out) { - for (ClassObj c : classes.values()) { - out.println("/* " + c.className + " */"); - for (Statement s : c.nativeCode) { - out.println(s.asString()); - } - for (FieldObj f : c.staticFields.values()) { - StringBuilder buff = new StringBuilder(); - if (f.isFinal) { - buff.append("const "); - } - buff.append(f.type.asString()); - buff.append(" ").append(toC(c.className + "." + f.name)); - if (f.value != null) { - buff.append(" = ").append(f.value.asString()); - } - buff.append(";"); - out.println(buff.toString()); - } - for (ArrayList list : c.methods.values()) { - for (MethodObj m : list) { - if (m.isIgnore) { - continue; - } - if (m.isStatic) { - out.print(m.returnType.asString() + " " - + toC(c.className + "_" + m.name) + "("); - } else if (m.isConstructor) { - out.print(toC(c.className) + "::" + toC(c.className) - + "("); - } else { - out.print(m.returnType.asString() + " " - + toC(c.className) + "::" + m.name + "("); - } - int i = 0; - for (FieldObj p : m.parameters.values()) { - if (i > 0) { - out.print(", "); - } - out.print(p.type.asString() + " " + p.name); - i++; - } - out.println(") {"); - if (m.isConstructor) { - for (FieldObj f : c.instanceFields.values()) { - out.print(" "); - out.print("this->" + f.name); - out.print(" = " + f.value.asString()); - out.println(";"); - } - } - if (m.block != null) { - m.block.setMethod(m); - out.print(m.block.asString()); - } - out.println("}"); - out.println(); - } - } - } - } - - private static String indent(String s, int spaces) { - StringBuilder buff = new StringBuilder(s.length() + spaces); - for (int i = 0; i < s.length();) { - for (int j = 0; j < spaces; j++) { - buff.append(' '); - } - int n = s.indexOf('\n', i); - n = n < 0 ? s.length() : n + 1; - buff.append(s.substring(i, n)); - i = n; - } - if (!s.endsWith("\n")) { - buff.append('\n'); - } - return buff.toString(); - } - - /** - * Move the source code 4 levels to the right. - * - * @param o the source code - * @return the indented code - */ - static String indent(String o) { - return indent(o, 4); - } - - /** - * Get the C++ representation of this identifier. - * - * @param identifier the identifier - * @return the C representation - */ - static String toC(String identifier) { - return identifier.replace('.', '_'); - } - - ClassObj getClassObj() { - return classObj; - } - - /** - * Get the class of the given name. - * - * @param className the name - * @return the class - */ - ClassObj getClassObj(String className) { - ClassObj c = BUILT_IN_CLASSES.get(className); - if (c == null) { - c = classes.get(className); - } - return c; - } - -} - -/** - * The parse state. - */ -class ParseState { - - /** - * The parse index. - */ - int index; - - /** - * The token type - */ - int type; - - /** - * The token text. - */ - String token; - - /** - * The line number. - */ - int line; -} \ No newline at end of file diff --git a/h2/src/tools/org/h2/java/Local.java b/h2/src/tools/org/h2/java/Local.java deleted file mode 100644 index 2df19d9527..0000000000 --- a/h2/src/tools/org/h2/java/Local.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -/** - * This annotation marks fields that are not shared and therefore don't need to - * be garbage collected separately. - */ -public @interface Local { - // empty -} diff --git a/h2/src/tools/org/h2/java/Statement.java b/h2/src/tools/org/h2/java/Statement.java deleted file mode 100644 index 13a5b2e8bf..0000000000 --- a/h2/src/tools/org/h2/java/Statement.java +++ /dev/null @@ -1,504 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -import java.util.ArrayList; - -/** - * A statement. - */ -public interface Statement { - - void setMethod(MethodObj method); - boolean isEnd(); - - /** - * Get the C++ code. - * - * @return the C++ code - */ - String asString(); - -} - -/** - * The base class for statements. - */ -abstract class StatementBase implements Statement { - - @Override - public boolean isEnd() { - return false; - } - -} - -/** - * A "return" statement. - */ -class ReturnStatement extends StatementBase { - - /** - * The return expression. - */ - Expr expr; - - private MethodObj method; - - @Override - public void setMethod(MethodObj method) { - this.method = method; - } - - @Override - public String asString() { - if (expr == null) { - return "return;"; - } - Type returnType = method.returnType; - expr.setType(returnType); - if (!expr.getType().isObject()) { - return "return " + expr.asString() + ";"; - } - if (returnType.refCount) { - return "return " + expr.getType().asString() + "(" + expr.asString() + ");"; - } - return "return " + expr.asString() + ";"; - } - -} - -/** - * A "do .. while" statement. - */ -class DoWhileStatement extends StatementBase { - - /** - * The condition. - */ - Expr condition; - - /** - * The execution block. - */ - Statement block; - - @Override - public void setMethod(MethodObj method) { - block.setMethod(method); - } - - @Override - public String asString() { - return "do {\n" + block + "} while (" + condition.asString() + ");"; - } - -} - -/** - * A "continue" statement. - */ -class ContinueStatement extends StatementBase { - - @Override - public void setMethod(MethodObj method) { - // ignore - } - - @Override - public String asString() { - return "continue;"; - } - -} - -/** - * A "break" statement. - */ -class BreakStatement extends StatementBase { - - @Override - public void setMethod(MethodObj method) { - // ignore - } - - @Override - public String asString() { - return "break;"; - } - -} - -/** - * An empty statement. - */ -class EmptyStatement extends StatementBase { - - @Override - public void setMethod(MethodObj method) { - // ignore - } - - @Override - public String asString() { - return ";"; - } - -} - -/** - * A "switch" statement. - */ -class SwitchStatement extends StatementBase { - - private StatementBlock defaultBlock; - private final ArrayList cases = new ArrayList<>(); - private final ArrayList blocks = - new ArrayList<>(); - private final Expr expr; - - public SwitchStatement(Expr expr) { - this.expr = expr; - } - - @Override - public void setMethod(MethodObj method) { - defaultBlock.setMethod(method); - for (StatementBlock b : blocks) { - b.setMethod(method); - } - } - - @Override - public String asString() { - StringBuilder buff = new StringBuilder(); - buff.append("switch (").append(expr.asString()).append(") {\n"); - for (int i = 0; i < cases.size(); i++) { - buff.append("case " + cases.get(i).asString() + ":\n"); - buff.append(blocks.get(i).toString()); - } - if (defaultBlock != null) { - buff.append("default:\n"); - buff.append(defaultBlock.toString()); - } - buff.append("}"); - return buff.toString(); - } - - public void setDefaultBlock(StatementBlock block) { - this.defaultBlock = block; - } - - /** - * Add a case. - * - * @param expr the case expression - * @param block the execution block - */ - public void addCase(Expr expr, StatementBlock block) { - cases.add(expr); - blocks.add(block); - } - -} - -/** - * An expression statement. - */ -class ExprStatement extends StatementBase { - - private final Expr expr; - - public ExprStatement(Expr expr) { - this.expr = expr; - } - - @Override - public void setMethod(MethodObj method) { - // ignore - } - - @Override - public String asString() { - return expr.asString() + ";"; - } - -} - -/** - * A "while" statement. - */ -class WhileStatement extends StatementBase { - - /** - * The condition. - */ - Expr condition; - - /** - * The execution block. - */ - Statement block; - - @Override - public void setMethod(MethodObj method) { - block.setMethod(method); - } - - @Override - public String asString() { - String w = "while (" + condition.asString() + ")"; - String s = block.toString(); - return w + "\n" + s; - } - -} - -/** - * An "if" statement. - */ -class IfStatement extends StatementBase { - - /** - * The condition. - */ - Expr condition; - - /** - * The execution block. - */ - Statement block; - - /** - * The else block. - */ - Statement elseBlock; - - @Override - public void setMethod(MethodObj method) { - block.setMethod(method); - if (elseBlock != null) { - elseBlock.setMethod(method); - } - } - - @Override - public String asString() { - String w = "if (" + condition.asString() + ") {\n"; - String s = block.asString(); - if (elseBlock != null) { - s += "} else {\n" + elseBlock.asString(); - } - return w + s + "}"; - } - -} - -/** - * A "for" statement. - */ -class ForStatement extends StatementBase { - - /** - * The init block. - */ - Statement init; - - /** - * The condition. - */ - Expr condition; - - /** - * The main loop block. - */ - Statement block; - - /** - * The update list. - */ - ArrayList updates = new ArrayList<>(); - - /** - * The type of the iterable. - */ - Type iterableType; - - /** - * The iterable variable name. - */ - String iterableVariable; - - /** - * The iterable expression. - */ - Expr iterable; - - @Override - public void setMethod(MethodObj method) { - block.setMethod(method); - } - - @Override - public String asString() { - StringBuilder buff = new StringBuilder(); - buff.append("for ("); - if (iterableType != null) { - Type it = iterable.getType(); - if (it != null && it.arrayLevel > 0) { - String idx = "i_" + iterableVariable; - buff.append("int " + idx + " = 0; " + - idx + " < " + iterable.asString() + "->length(); " + - idx + "++"); - buff.append(") {\n"); - buff.append(JavaParser.indent(iterableType + - " " + iterableVariable + " = " + - iterable.asString() + "->at("+ idx +");\n")); - buff.append(block.toString()).append("}"); - } else { - // TODO iterate over a collection - buff.append(iterableType).append(' '); - buff.append(iterableVariable).append(": "); - buff.append(iterable); - buff.append(") {\n"); - buff.append(block.toString()).append("}"); - } - } else { - buff.append(init.asString()); - buff.append(" ").append(condition.asString()).append("; "); - for (int i = 0; i < updates.size(); i++) { - if (i > 0) { - buff.append(", "); - } - buff.append(updates.get(i).asString()); - } - buff.append(") {\n"); - buff.append(block.asString()).append("}"); - } - return buff.toString(); - } - -} - -/** - * A statement block. - */ -class StatementBlock extends StatementBase { - - /** - * The list of instructions. - */ - final ArrayList instructions = new ArrayList<>(); - - @Override - public void setMethod(MethodObj method) { - for (Statement s : instructions) { - s.setMethod(method); - } - } - - @Override - public String asString() { - StringBuilder buff = new StringBuilder(); - for (Statement s : instructions) { - if (s.isEnd()) { - break; - } - buff.append(JavaParser.indent(s.asString())); - } - return buff.toString(); - } - -} - -/** - * A variable declaration. - */ -class VarDecStatement extends StatementBase { - - /** - * The type. - */ - Type type; - - private final ArrayList variables = new ArrayList<>(); - private final ArrayList values = new ArrayList<>(); - - @Override - public void setMethod(MethodObj method) { - // ignore - } - - @Override - public String asString() { - StringBuilder buff = new StringBuilder(); - buff.append(type.asString()).append(' '); - StringBuilder assign = new StringBuilder(); - for (int i = 0; i < variables.size(); i++) { - if (i > 0) { - buff.append(", "); - } - String varName = variables.get(i); - buff.append(varName); - Expr value = values.get(i); - if (value != null) { - if (!value.getType().isObject()) { - buff.append(" = ").append(value.asString()); - } else { - value.setType(type); - assign.append(varName).append(" = ").append(value.asString()).append(";\n"); - } - } - } - buff.append(";"); - if (assign.length() > 0) { - buff.append("\n"); - buff.append(assign); - } - return buff.toString(); - } - - /** - * Add a variable. - * - * @param name the variable name - * @param value the init value - */ - public void addVariable(String name, Expr value) { - variables.add(name); - values.add(value); - } - -} - -/** - * A native statement. - */ -class StatementNative extends StatementBase { - - private final String code; - - StatementNative(String code) { - this.code = code; - } - - @Override - public void setMethod(MethodObj method) { - // ignore - } - - @Override - public String asString() { - return code; - } - - @Override - public boolean isEnd() { - return code.equals("return;"); - } - -} - diff --git a/h2/src/tools/org/h2/java/Test.java b/h2/src/tools/org/h2/java/Test.java deleted file mode 100644 index 9ce40aece4..0000000000 --- a/h2/src/tools/org/h2/java/Test.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import org.h2.test.TestBase; - -/** - * A test for the Java parser. - */ -public class Test extends TestBase { - - /** - * Start the task with the given arguments. - * - * @param args the arguments, or null - */ - public static void main(String... args) throws IOException { - new Test().test(); - } - - @Override - public void test() throws IOException { - // g++ -o test test.cpp - // chmod +x test - // ./test - - // TODO initialize fields - - // include files: - // /usr/include/c++/4.2.1/tr1/stdio.h - // /usr/include/stdio.h - // inttypes.h - - // not supported yet: - // exceptions - // HexadecimalFloatingPointLiteral - // int x()[] { return null; } - // import static - // import * - // initializer blocks - // access to static fields with instance variable - // final variables (within blocks, parameter list) - // Identifier : (labels) - // ClassOrInterfaceDeclaration within blocks - // (or any other nested classes) - // assert - - assertEquals("\\\\" + "u0000", JavaParser.replaceUnicode("\\\\" + "u0000")); - assertEquals("\u0000", JavaParser.replaceUnicode("\\" + "u0000")); - assertEquals("\u0000", JavaParser.replaceUnicode("\\" + "uu0000")); - assertEquals("\\\\" + "\u0000", JavaParser.replaceUnicode("\\\\\\" + "u0000")); - - assertEquals("0", JavaParser.readNumber("0a")); - assertEquals("0l", JavaParser.readNumber("0l")); - assertEquals("0xFFL", JavaParser.readNumber("0xFFLx")); - assertEquals("0xDadaCafe", JavaParser.readNumber("0xDadaCafex")); - assertEquals("1.40e-45f", JavaParser.readNumber("1.40e-45fx")); - assertEquals("1e1f", JavaParser.readNumber("1e1fx")); - assertEquals("2.f", JavaParser.readNumber("2.fx")); - assertEquals(".3d", JavaParser.readNumber(".3dx")); - assertEquals("6.022137e+23f", JavaParser.readNumber("6.022137e+23f+1")); - - JavaParser parser = new JavaParser(); - parser.parse("src/tools/org/h2", "java.lang.Object"); - parser.parse("src/tools/org/h2", "java.lang.String"); - parser.parse("src/tools/org/h2", "java.lang.Math"); - parser.parse("src/tools/org/h2", "java.lang.Integer"); - parser.parse("src/tools/org/h2", "java.lang.Long"); - parser.parse("src/tools/org/h2", "java.lang.StringBuilder"); - parser.parse("src/tools/org/h2", "java.io.PrintStream"); - parser.parse("src/tools/org/h2", "java.lang.System"); - parser.parse("src/tools/org/h2", "java.util.Arrays"); - parser.parse("src/tools", "org.h2.java.TestApp"); - - PrintWriter w = new PrintWriter(System.out); - parser.writeHeader(w); - parser.writeSource(w); - w.flush(); - w = new PrintWriter(new FileWriter("bin/test.cpp")); - parser.writeHeader(w); - parser.writeSource(w); - w.close(); - - } - -} diff --git a/h2/src/tools/org/h2/java/TestApp.java b/h2/src/tools/org/h2/java/TestApp.java deleted file mode 100644 index cd848c6869..0000000000 --- a/h2/src/tools/org/h2/java/TestApp.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java; - -/** - * A test application. - */ -public class TestApp { - -/* c: - -int main(int argc, char** argv) { -// org_h2_java_TestApp_main(0); - org_h2_java_TestApp_main(ptr > >()); -} - -*/ - - /** - * Run this application. - * - * @param args the command line arguments - */ - public static void main(String... args) { - String[] list = new String[1000]; - for (int i = 0; i < 1000; i++) { - list[i] = "Hello " + i; - } - - // time:29244000 mac g++ -O3 without array bound checks - // time:30673000 mac java - // time:32449000 mac g++ -O3 - // time:69692000 mac g++ -O3 ref counted - // time:1200000000 raspberry g++ -O3 - // time:1720000000 raspberry g++ -O3 ref counted - // time:1980469000 raspberry java IcedTea6 1.8.13 Cacao VM - // time:12962645810 raspberry java IcedTea6 1.8.13 Zero VM - // java -XXaltjvm=cacao - - for (int k = 0; k < 4; k++) { - long t = System.nanoTime(); - long h = 0; - for (int j = 0; j < 10000; j++) { - for (int i = 0; i < 1000; i++) { - String s = list[i]; - h = (h * 7) ^ s.hashCode(); - } - } - System.out.println("hash: " + h); - t = System.nanoTime() - t; - System.out.println("time:" + t); - } - } - -} diff --git a/h2/src/tools/org/h2/java/io/PrintStream.java b/h2/src/tools/org/h2/java/io/PrintStream.java deleted file mode 100644 index 4eed18ddb9..0000000000 --- a/h2/src/tools/org/h2/java/io/PrintStream.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.io; - -/** - * A print stream. - */ -public class PrintStream { - - /** - * Print the given string. - * - * @param s the string - */ - @SuppressWarnings("unused") - public void println(String s) { - // c: int x = s->chars->length(); - // c: printf("%.*S\n", x, s->chars->getPointer()); - } - -} diff --git a/h2/src/tools/org/h2/java/io/package.html b/h2/src/tools/org/h2/java/io/package.html deleted file mode 100644 index fb9167e95f..0000000000 --- a/h2/src/tools/org/h2/java/io/package.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - -Javadoc package documentation -

- -A simple implementation of the java.lang.* package for the Java parser. - -

\ No newline at end of file diff --git a/h2/src/tools/org/h2/java/lang/Integer.java b/h2/src/tools/org/h2/java/lang/Integer.java deleted file mode 100644 index 94e98755e9..0000000000 --- a/h2/src/tools/org/h2/java/lang/Integer.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -/** - * A java.lang.Integer implementation. - */ -public class Integer { - - /** - * The smallest possible value. - */ - public static final int MIN_VALUE = 1 << 31; - - /** - * The largest possible value. - */ - public static final int MAX_VALUE = (int) ((1L << 31) - 1); - - /** - * Convert a value to a String. - * - * @param x the value - * @return the String - */ - public static String toString(int x) { - // c: wchar_t ch[20]; - // c: swprintf(ch, 20, L"%" PRId32, x); - // c: return STRING(ch); - // c: return; - if (x == MIN_VALUE) { - return String.wrap("-2147483648"); - } - char[] ch = new char[20]; - int i = 20 - 1, count = 0; - boolean negative; - if (x < 0) { - negative = true; - x = -x; - } else { - negative = false; - } - for (; i >= 0; i--) { - ch[i] = (char) ('0' + (x % 10)); - x /= 10; - count++; - if (x == 0) { - break; - } - } - if (negative) { - ch[--i] = '-'; - count++; - } - return new String(ch, i, count); - } - -} diff --git a/h2/src/tools/org/h2/java/lang/Long.java b/h2/src/tools/org/h2/java/lang/Long.java deleted file mode 100644 index fa99c22cd4..0000000000 --- a/h2/src/tools/org/h2/java/lang/Long.java +++ /dev/null @@ -1,62 +0,0 @@ -/* -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -/** - * A java.lang.Long implementation. - */ -public class Long { - - /** - * The smallest possible value. - */ - public static final long MIN_VALUE = 1L << 63; - - /** - * The largest possible value. - */ - public static final long MAX_VALUE = (1L << 63) - 1; - - /** - * Convert a value to a String. - * - * @param x the value - * @return the String - */ - public static String toString(long x) { - // c: wchar_t ch[30]; - // c: swprintf(ch, 30, L"%" PRId64, x); - // c: return STRING(ch); - // c: return; - if (x == MIN_VALUE) { - return String.wrap("-9223372036854775808"); - } - char[] ch = new char[30]; - int i = 30 - 1, count = 0; - boolean negative; - if (x < 0) { - negative = true; - x = -x; - } else { - negative = false; - } - for (; i >= 0; i--) { - ch[i] = (char) ('0' + (x % 10)); - x /= 10; - count++; - if (x == 0) { - break; - } - } - if (negative) { - ch[--i] = '-'; - count++; - } - return new String(ch, i, count); - } - -} diff --git a/h2/src/tools/org/h2/java/lang/Math.java b/h2/src/tools/org/h2/java/lang/Math.java deleted file mode 100644 index f32cc63669..0000000000 --- a/h2/src/tools/org/h2/java/lang/Math.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -/** - * A java.lang.String implementation. - */ -public class Math { - - /** - * Get the larger of both values. - * - * @param a the first value - * @param b the second value - * @return the larger - */ - public static int max(int a, int b) { - return a > b ? a : b; - } - -} diff --git a/h2/src/tools/org/h2/java/lang/Object.java b/h2/src/tools/org/h2/java/lang/Object.java deleted file mode 100644 index 2f7fb39921..0000000000 --- a/h2/src/tools/org/h2/java/lang/Object.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -/** - * A java.lang.Object implementation. - */ -public class Object { - - @Override - public int hashCode() { - return 0; - } - - public boolean equals(Object other) { - return other == this; - } - - @Override - public java.lang.String toString() { - return "?"; - } - -} diff --git a/h2/src/tools/org/h2/java/lang/String.java b/h2/src/tools/org/h2/java/lang/String.java deleted file mode 100644 index 7f316c6041..0000000000 --- a/h2/src/tools/org/h2/java/lang/String.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -import org.h2.java.Ignore; -import org.h2.java.Local; - -/* c: - -#include -#include -#include -#include -#include -#include -#define __STDC_FORMAT_MACROS -#include - -#define jvoid void -#define jboolean int8_t -#define jbyte int8_t -#define jchar wchar_t -#define jint int32_t -#define jlong int64_t -#define jfloat float -#define jdouble double -#define ujint uint32_t -#define ujlong uint64_t -#define true 1 -#define false 0 -#define null 0 - -#define STRING_REF(s) ptr \ - (new java_lang_String(ptr< array > \ - (new array(s, (jint) wcslen(s))))); - -#define STRING_PTR(s) new java_lang_String \ - (new array(s, (jint) wcslen(s))); - -class RefBase { -protected: - jint refCount; -public: - RefBase() { - refCount = 0; - } - void reference() { - refCount++; - } - void release() { - if (--refCount == 0) { - delete this; - } - } - virtual ~RefBase() { - } -}; -template class ptr { - T* pointer; -public: - explicit ptr(T* p=0) : pointer(p) { - if (p != 0) { - ((RefBase*)p)->reference(); - } - } - ptr(const ptr& p) : pointer(p.pointer) { - if (p.pointer != 0) { - ((RefBase*)p.pointer)->reference(); - } - } - ~ptr() { - if (pointer != 0) { - ((RefBase*)pointer)->release(); - } - } - ptr& operator= (const ptr& p) { - if (this != &p && pointer != p.pointer) { - if (pointer != 0) { - ((RefBase*)pointer)->release(); - } - pointer = p.pointer; - if (pointer != 0) { - ((RefBase*)pointer)->reference(); - } - } - return *this; - } - T& operator*() { - return *pointer; - } - T* getPointer() { - return pointer; - } - T* operator->() { - return pointer; - } - jboolean operator==(const ptr& p) { - return pointer == p->pointer; - } - jboolean operator==(const RefBase* t) { - return pointer == t; - } -}; -template class array : RefBase { - jint len; - T* data; -public: - array(const T* d, jint len) { - this->len = len; - data = new T[len]; - memcpy(data, d, sizeof(T) * len); - } - array(jint len) { - this->len = len; - data = new T[len]; - } - ~array() { - delete[] data; - } - T* getPointer() { - return data; - } - jint length() { - return len; - } - T& operator[](jint index) { - if (index < 0 || index >= len) { - throw "index set"; - } - return data[index]; - } - T& at(jint index) { - if (index < 0 || index >= len) { - throw "index set"; - } - return data[index]; - } -}; - -*/ - -/** - * A java.lang.String implementation. - */ -public class String { - - /** - * The character array. - */ - @Local - char[] chars; - - private int hash; - - public String(char[] chars) { - this.chars = new char[chars.length]; - System.arraycopy(chars, 0, this.chars, 0, chars.length); - } - - public String(char[] chars, int offset, int count) { - this.chars = new char[count]; - System.arraycopy(chars, offset, this.chars, 0, count); - } - - @Override - public int hashCode() { - int h = hash; - if (h == 0) { - int size = chars.length; - if (size != 0) { - for (int i = 0; i < size; i++) { - h = h * 31 + chars[i]; - } - hash = h; - } - } - return h; - } - - /** - * Get the length of the string. - * - * @return the length - */ - public int length() { - return chars.length; - } - - /** - * The toString method. - * - * @return the string - */ - public String toStringMethod() { - return this; - } - - /** - * Get the java.lang.String. - * - * @return the string - */ - @Ignore - public java.lang.String asString() { - return new java.lang.String(chars); - } - - /** - * Wrap a java.lang.String. - * - * @param x the string - * @return the object - */ - @Ignore - public static String wrap(java.lang.String x) { - return new String(x.toCharArray()); - } - -} diff --git a/h2/src/tools/org/h2/java/lang/StringBuilder.java b/h2/src/tools/org/h2/java/lang/StringBuilder.java deleted file mode 100644 index 3d7eb79f11..0000000000 --- a/h2/src/tools/org/h2/java/lang/StringBuilder.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -/** - * A java.lang.String implementation. - */ -public class StringBuilder { - - private int length; - private char[] buffer; - - public StringBuilder(String s) { - char[] chars = s.chars; - int len = chars.length; - buffer = new char[len]; - System.arraycopy(chars, 0, buffer, 0, len); - this.length = len; - } - - public StringBuilder() { - buffer = new char[10]; - } - - /** - * Append the given value. - * - * @param x the value - * @return this - */ - public StringBuilder append(String x) { - int l = x.length(); - ensureCapacity(l); - System.arraycopy(x.chars, 0, buffer, length, l); - length += l; - return this; - } - - /** - * Append the given value. - * - * @param x the value - * @return this - */ - public StringBuilder append(int x) { - append(Integer.toString(x)); - return this; - } - - @Override - public java.lang.String toString() { - return new java.lang.String(buffer, 0, length); - } - - private void ensureCapacity(int plus) { - if (buffer.length < length + plus) { - char[] b = new char[Math.max(length + plus, buffer.length * 2)]; - System.arraycopy(buffer, 0, b, 0, length); - buffer = b; - } - } - -} diff --git a/h2/src/tools/org/h2/java/lang/System.java b/h2/src/tools/org/h2/java/lang/System.java deleted file mode 100644 index ba75438608..0000000000 --- a/h2/src/tools/org/h2/java/lang/System.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.lang; - -import java.io.PrintStream; - -/** - * A simple java.lang.System implementation. - */ -public class System { - - /** - * The stdout stream. - */ - public static PrintStream out; - - /** - * Copy data from the source to the target. - * Source and target may overlap. - * - * @param src the source array - * @param srcPos the first element in the source array - * @param dest the destination - * @param destPos the first element in the destination - * @param length the number of element to copy - */ - public static void arraycopy(char[] src, int srcPos, char[] dest, - int destPos, int length) { - /* c: - memmove(((jchar*)dest->getPointer()) + destPos, - ((jchar*)src->getPointer()) + srcPos, sizeof(jchar) * length); - */ - // c: return; - java.lang.System.arraycopy(src, srcPos, dest, destPos, length); - } - - /** - * Copy data from the source to the target. - * Source and target may overlap. - * - * @param src the source array - * @param srcPos the first element in the source array - * @param dest the destination - * @param destPos the first element in the destination - * @param length the number of element to copy - */ - public static void arraycopy(byte[] src, int srcPos, byte[] dest, - int destPos, int length) { - /* c: - memmove(((jbyte*)dest->getPointer()) + destPos, - ((jbyte*)src->getPointer()) + srcPos, sizeof(jbyte) * length); - */ - // c: return; - java.lang.System.arraycopy(src, srcPos, dest, destPos, length); - } - - /** - * Get the current time in milliseconds since 1970-01-01. - * - * @return the milliseconds - */ - public static long nanoTime() { - /* c: - #if CLOCKS_PER_SEC == 1000000 - return (jlong) clock() * 1000; - #else - return (jlong) clock() * 1000000 / CLOCKS_PER_SEC; - #endif - */ - // c: return; - return java.lang.System.nanoTime(); - } - -} diff --git a/h2/src/tools/org/h2/java/lang/package.html b/h2/src/tools/org/h2/java/lang/package.html deleted file mode 100644 index fb9167e95f..0000000000 --- a/h2/src/tools/org/h2/java/lang/package.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - -Javadoc package documentation -

- -A simple implementation of the java.lang.* package for the Java parser. - -

\ No newline at end of file diff --git a/h2/src/tools/org/h2/java/package.html b/h2/src/tools/org/h2/java/package.html deleted file mode 100644 index 0beb44f98c..0000000000 --- a/h2/src/tools/org/h2/java/package.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - -Javadoc package documentation -

- -A Java parser implementation. - -

\ No newline at end of file diff --git a/h2/src/tools/org/h2/java/util/Arrays.java b/h2/src/tools/org/h2/java/util/Arrays.java deleted file mode 100644 index 463625c980..0000000000 --- a/h2/src/tools/org/h2/java/util/Arrays.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2004-2022 H2 Group. Multiple-Licensed under the MPL 2.0, - * and the EPL 1.0 (https://h2database.com/html/license.html). - * Initial Developer: H2 Group - */ -package org.h2.java.util; - -/** - * An simple implementation of java.util.Arrays - */ -public class Arrays { - - /** - * Fill an array with the given value. - * - * @param array the array - * @param x the value - */ - public static void fill(char[] array, char x) { - for (int i = 0, size = array.length; i < size; i++) { - array[i] = x; - } - } - - /** - * Fill an array with the given value. - * - * @param array the array - * @param x the value - */ - public static void fill(byte[] array, byte x) { - for (int i = 0; i < array.length; i++) { - array[i] = x; - } - } - - /** - * Fill an array with the given value. - * - * @param array the array - * @param x the value - */ - public static void fill(int[] array, int x) { - for (int i = 0; i < array.length; i++) { - array[i] = x; - } - } - - - /** - * Fill an array with the given value. - * - * @param array the array - * @param x the value - */ - public static void fillByte(byte[] array, byte x) { - for (int i = 0; i < array.length; i++) { - array[i] = x; - } - } - - /** - * Fill an array with the given value. - * - * @param array the array - * @param x the value - */ - public static void fillInt(int[] array, int x) { - for (int i = 0; i < array.length; i++) { - array[i] = x; - } - } - -} diff --git a/h2/src/tools/org/h2/java/util/package.html b/h2/src/tools/org/h2/java/util/package.html deleted file mode 100644 index fb9167e95f..0000000000 --- a/h2/src/tools/org/h2/java/util/package.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - -Javadoc package documentation -

- -A simple implementation of the java.lang.* package for the Java parser. - -

\ No newline at end of file From 8aeb3d787ab718f224b0a5b052b91aea8463cd57 Mon Sep 17 00:00:00 2001 From: Evgenij Ryazanov Date: Tue, 18 Jan 2022 18:55:21 +0800 Subject: [PATCH 06/93] Really use DateTimeFormatter with time zone in DateTimeFormatFunction --- .../main/org/h2/expression/function/DateTimeFormatFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h2/src/main/org/h2/expression/function/DateTimeFormatFunction.java b/h2/src/main/org/h2/expression/function/DateTimeFormatFunction.java index e426807e91..361836ebe9 100644 --- a/h2/src/main/org/h2/expression/function/DateTimeFormatFunction.java +++ b/h2/src/main/org/h2/expression/function/DateTimeFormatFunction.java @@ -262,7 +262,7 @@ private static CacheValue getDateFormat(String format, String locale, String tim ZoneId zoneId; if (timeZone != null) { zoneId = getZoneId(timeZone); - df.withZone(zoneId); + df = df.withZone(zoneId); } else { zoneId = null; } From 1e6944698c98a0db8534770ece2052c5ffe8a85b Mon Sep 17 00:00:00 2001 From: Evgenij Ryazanov Date: Tue, 18 Jan 2022 19:30:29 +0800 Subject: [PATCH 07/93] Fix some warnings from Sonatype Lift --- h2/src/main/org/h2/bnf/Bnf.java | 6 ++++-- h2/src/main/org/h2/command/Parser.java | 8 ++++---- h2/src/main/org/h2/command/dml/Help.java | 4 +++- h2/src/main/org/h2/engine/Database.java | 2 +- h2/src/main/org/h2/engine/SessionLocal.java | 2 +- h2/src/main/org/h2/engine/SettingsBase.java | 3 ++- .../main/org/h2/fulltext/FullTextSettings.java | 17 ++++++++--------- .../main/org/h2/jdbcx/JdbcConnectionPool.java | 2 +- h2/src/main/org/h2/message/Trace.java | 2 +- h2/src/main/org/h2/mode/PgCatalogTable.java | 7 +++---- h2/src/main/org/h2/mvstore/DataUtils.java | 2 +- h2/src/main/org/h2/mvstore/db/Store.java | 2 +- .../main/org/h2/mvstore/db/ValueDataType.java | 2 +- .../org/h2/mvstore/type/ObjectDataType.java | 6 ++---- h2/src/main/org/h2/security/AES.java | 2 +- h2/src/main/org/h2/security/CipherFactory.java | 5 +---- .../impl/StaticUserCredentialsValidator.java | 5 +++-- .../main/org/h2/server/pg/PgServerThread.java | 2 +- h2/src/main/org/h2/server/web/WebServer.java | 5 +++-- h2/src/main/org/h2/store/Data.java | 2 +- .../h2/table/InformationSchemaTableLegacy.java | 4 ++-- h2/src/main/org/h2/table/Table.java | 2 +- h2/src/main/org/h2/table/TableFilter.java | 2 +- h2/src/main/org/h2/tools/MultiDimension.java | 2 +- h2/src/main/org/h2/util/MathUtils.java | 4 ++-- h2/src/main/org/h2/util/SortedProperties.java | 12 ++++++------ h2/src/main/org/h2/util/StringUtils.java | 4 ++-- .../main/org/h2/util/json/JSONBytesSource.java | 4 ++-- h2/src/main/org/h2/value/ValueBinary.java | 2 +- h2/src/main/org/h2/value/ValueJavaObject.java | 2 +- h2/src/main/org/h2/value/ValueTime.java | 2 +- h2/src/main/org/h2/value/ValueUuid.java | 2 +- h2/src/main/org/h2/value/ValueVarbinary.java | 2 +- .../org/h2/value/lob/LobDataFetchOnDemand.java | 2 +- 34 files changed, 66 insertions(+), 66 deletions(-) diff --git a/h2/src/main/org/h2/bnf/Bnf.java b/h2/src/main/org/h2/bnf/Bnf.java index 3faccea4e4..c32ab4860b 100644 --- a/h2/src/main/org/h2/bnf/Bnf.java +++ b/h2/src/main/org/h2/bnf/Bnf.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -52,7 +53,7 @@ public static Bnf getInstance(Reader csv) throws SQLException, IOException { Bnf bnf = new Bnf(); if (csv == null) { byte[] data = Utils.getResource("/org/h2/res/help.csv"); - csv = new InputStreamReader(new ByteArrayInputStream(data)); + csv = new InputStreamReader(new ByteArrayInputStream(data), StandardCharsets.UTF_8); } bnf.parse(csv); return bnf; @@ -168,7 +169,8 @@ public static boolean startWithSpace(String s) { */ public static String getRuleMapKey(String token) { StringBuilder buff = new StringBuilder(); - for (char ch : token.toCharArray()) { + for (int i = 0, l = token.length(); i < l; i++) { + char ch = token.charAt(i); if (Character.isUpperCase(ch)) { buff.append('_').append(Character.toLowerCase(ch)); } else { diff --git a/h2/src/main/org/h2/command/Parser.java b/h2/src/main/org/h2/command/Parser.java index 6aa8a51d37..505f24844a 100644 --- a/h2/src/main/org/h2/command/Parser.java +++ b/h2/src/main/org/h2/command/Parser.java @@ -641,12 +641,12 @@ Prepared parse(String sql, ArrayList tokens) { Prepared p; try { // first, try the fast variant - p = parse(sql, false); + p = parse(false); } catch (DbException e) { if (e.getErrorCode() == ErrorCode.SYNTAX_ERROR_1) { // now, get the detailed exception resetTokenIndex(); - p = parse(sql, true); + p = parse(true); } else { throw e.addSQL(sql); } @@ -656,7 +656,7 @@ Prepared parse(String sql, ArrayList tokens) { return p; } - private Prepared parse(String sql, boolean withExpectedList) { + private Prepared parse(boolean withExpectedList) { if (withExpectedList) { expectedList = new ArrayList<>(); } else { @@ -5437,7 +5437,7 @@ && equalsToken("E", name)) { break; case 'U': if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR - && (equalsToken("UUID", name))) { + && equalsToken("UUID", name)) { String uuid = token.value(session).getString(); read(); return ValueExpression.get(ValueUuid.get(uuid)); diff --git a/h2/src/main/org/h2/command/dml/Help.java b/h2/src/main/org/h2/command/dml/Help.java index 528909e31d..338e2f1b20 100644 --- a/h2/src/main/org/h2/command/dml/Help.java +++ b/h2/src/main/org/h2/command/dml/Help.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.sql.ResultSet; import org.h2.command.CommandInterface; @@ -127,7 +128,8 @@ public static String processHelpText(String s) { * on I/O exception */ public static ResultSet getTable() throws IOException { - Reader reader = new InputStreamReader(new ByteArrayInputStream(Utils.getResource("/org/h2/res/help.csv"))); + Reader reader = new InputStreamReader(new ByteArrayInputStream(Utils.getResource("/org/h2/res/help.csv")), + StandardCharsets.UTF_8); Csv csv = new Csv(); csv.setLineCommentCharacter('#'); return csv.read(reader, null); diff --git a/h2/src/main/org/h2/engine/Database.java b/h2/src/main/org/h2/engine/Database.java index f7d6958c4e..6f49bec122 100644 --- a/h2/src/main/org/h2/engine/Database.java +++ b/h2/src/main/org/h2/engine/Database.java @@ -208,7 +208,7 @@ public final class Database implements DataHandler, CastDataProvider { private JavaObjectSerializer javaObjectSerializer; private String javaObjectSerializerName; private volatile boolean javaObjectSerializerInitialized; - private boolean queryStatistics; + private volatile boolean queryStatistics; private int queryStatisticsMaxEntries = Constants.QUERY_STATISTICS_MAX_ENTRIES; private QueryStatisticsData queryStatisticsData; private RowFactory rowFactory = RowFactory.getRowFactory(); diff --git a/h2/src/main/org/h2/engine/SessionLocal.java b/h2/src/main/org/h2/engine/SessionLocal.java index 8117c628da..753ee14465 100644 --- a/h2/src/main/org/h2/engine/SessionLocal.java +++ b/h2/src/main/org/h2/engine/SessionLocal.java @@ -630,7 +630,7 @@ public Command prepareLocal(String sql) { * at the end of the current transaction. * @param id to be scheduled */ - protected void scheduleDatabaseObjectIdForRelease(int id) { + void scheduleDatabaseObjectIdForRelease(int id) { if (idsToRelease == null) { idsToRelease = new BitSet(); } diff --git a/h2/src/main/org/h2/engine/SettingsBase.java b/h2/src/main/org/h2/engine/SettingsBase.java index 2059dfdbb6..bfca5522fb 100644 --- a/h2/src/main/org/h2/engine/SettingsBase.java +++ b/h2/src/main/org/h2/engine/SettingsBase.java @@ -84,7 +84,8 @@ protected String get(String key, String defaultValue) { } StringBuilder buff = new StringBuilder("h2."); boolean nextUpper = false; - for (char c : key.toCharArray()) { + for (int i = 0, l = key.length(); i < l; i++) { + char c = key.charAt(i); if (c == '_') { nextUpper = true; } else { diff --git a/h2/src/main/org/h2/fulltext/FullTextSettings.java b/h2/src/main/org/h2/fulltext/FullTextSettings.java index 7cdfc2841c..8b867e4b3d 100644 --- a/h2/src/main/org/h2/fulltext/FullTextSettings.java +++ b/h2/src/main/org/h2/fulltext/FullTextSettings.java @@ -203,8 +203,7 @@ private static String getIndexPath(Connection conn) throws SQLException { * @return the prepared statement * @throws SQLException on failure */ - synchronized PreparedStatement prepare(Connection conn, String sql) - throws SQLException { + synchronized PreparedStatement prepare(Connection conn, String sql) throws SQLException { SoftValuesHashMap c = cache.get(conn); if (c == null) { c = new SoftValuesHashMap<>(); @@ -224,7 +223,7 @@ synchronized PreparedStatement prepare(Connection conn, String sql) /** * Remove all indexes from the settings. */ - protected void removeAllIndexes() { + void removeAllIndexes() { indexes.clear(); } @@ -233,7 +232,7 @@ protected void removeAllIndexes() { * * @param index the index to remove */ - protected void removeIndexInfo(IndexInfo index) { + void removeIndexInfo(IndexInfo index) { indexes.remove(index.id); } @@ -242,7 +241,7 @@ protected void removeIndexInfo(IndexInfo index) { * * @param b the new value */ - protected void setInitialized(boolean b) { + void setInitialized(boolean b) { this.initialized = b; } @@ -251,24 +250,24 @@ protected void setInitialized(boolean b) { * * @return whether this instance is initialized */ - protected boolean isInitialized() { + boolean isInitialized() { return initialized; } /** * Close all fulltext settings, freeing up memory. */ - protected static void closeAll() { + static void closeAll() { synchronized (SETTINGS) { SETTINGS.clear(); } } - protected void setWhitespaceChars(String whitespaceChars) { + void setWhitespaceChars(String whitespaceChars) { this.whitespaceChars = whitespaceChars; } - protected String getWhitespaceChars() { + String getWhitespaceChars() { return whitespaceChars; } diff --git a/h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java b/h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java index 0ff22cd22f..705060fbcc 100644 --- a/h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java +++ b/h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java @@ -77,7 +77,7 @@ public final class JdbcConnectionPool private AtomicInteger activeConnections = new AtomicInteger(); private AtomicBoolean isDisposed = new AtomicBoolean(); - protected JdbcConnectionPool(ConnectionPoolDataSource dataSource) { + private JdbcConnectionPool(ConnectionPoolDataSource dataSource) { this.dataSource = dataSource; if (dataSource != null) { try { diff --git a/h2/src/main/org/h2/message/Trace.java b/h2/src/main/org/h2/message/Trace.java index 066d026cdd..dd84fd61a0 100644 --- a/h2/src/main/org/h2/message/Trace.java +++ b/h2/src/main/org/h2/message/Trace.java @@ -94,7 +94,7 @@ public final class Trace { /** * Module names by their ids as array indexes. */ - public static final String[] MODULE_NAMES = { + static final String[] MODULE_NAMES = { "command", "constraint", "database", diff --git a/h2/src/main/org/h2/mode/PgCatalogTable.java b/h2/src/main/org/h2/mode/PgCatalogTable.java index 161da669a1..ac7afd020a 100644 --- a/h2/src/main/org/h2/mode/PgCatalogTable.java +++ b/h2/src/main/org/h2/mode/PgCatalogTable.java @@ -588,7 +588,7 @@ private void pgAttribute(SessionLocal session, ArrayList rows, Table table) int tableId = table.getId(); for (int i = 0; i < cols.length;) { Column column = cols[i++]; - addAttribute(session, rows, tableId * 10_000 + i, tableId, table, column, i); + addAttribute(session, rows, tableId * 10_000 + i, tableId, column, i); } for (Index index : table.getIndexes()) { if (index.getCreateSQL() == null) { @@ -598,8 +598,7 @@ private void pgAttribute(SessionLocal session, ArrayList rows, Table table) for (int i = 0; i < cols.length;) { Column column = cols[i++]; int indexId = index.getId(); - addAttribute(session, rows, 1_000_000 * indexId + tableId * 10_000 + i, indexId, table, column, - i); + addAttribute(session, rows, 1_000_000 * indexId + tableId * 10_000 + i, indexId, column, i); } } } @@ -656,7 +655,7 @@ private void pgConstraint(SessionLocal session, ArrayList rows) { } } - private void addAttribute(SessionLocal session, ArrayList rows, int id, int relId, Table table, Column column, + private void addAttribute(SessionLocal session, ArrayList rows, int id, int relId, Column column, int ordinal) { long precision = column.getType().getPrecision(); add(session, rows, diff --git a/h2/src/main/org/h2/mvstore/DataUtils.java b/h2/src/main/org/h2/mvstore/DataUtils.java index 872e7b79e6..c784b8c88e 100644 --- a/h2/src/main/org/h2/mvstore/DataUtils.java +++ b/h2/src/main/org/h2/mvstore/DataUtils.java @@ -331,7 +331,7 @@ public static void writeStringData(ByteBuffer buff, buff.put((byte) c); } else if (c >= 0x800) { buff.put((byte) (0xe0 | (c >> 12))); - buff.put((byte) (((c >> 6) & 0x3f))); + buff.put((byte) ((c >> 6) & 0x3f)); buff.put((byte) (c & 0x3f)); } else { buff.put((byte) (0xc0 | (c >> 6))); diff --git a/h2/src/main/org/h2/mvstore/db/Store.java b/h2/src/main/org/h2/mvstore/db/Store.java index 6f5b5befcf..35c3a58207 100644 --- a/h2/src/main/org/h2/mvstore/db/Store.java +++ b/h2/src/main/org/h2/mvstore/db/Store.java @@ -48,7 +48,7 @@ public final class Store { static char[] decodePassword(byte[] key) { char[] password = new char[key.length / 2]; for (int i = 0; i < password.length; i++) { - password[i] = (char) (((key[i + i] & 255) << 16) | ((key[i + i + 1]) & 255)); + password[i] = (char) (((key[i + i] & 255) << 16) | (key[i + i + 1] & 255)); } return password; } diff --git a/h2/src/main/org/h2/mvstore/db/ValueDataType.java b/h2/src/main/org/h2/mvstore/db/ValueDataType.java index 36d4ccbe0f..1d4b449310 100644 --- a/h2/src/main/org/h2/mvstore/db/ValueDataType.java +++ b/h2/src/main/org/h2/mvstore/db/ValueDataType.java @@ -528,7 +528,7 @@ public void write(WriteBuffer buff, Value v) { ordinal = ~ordinal; } buff.put(INTERVAL). - put((byte) (ordinal)). + put((byte) ordinal). putVarLong(interval.getLeading()). putVarLong(interval.getRemaining()); break; diff --git a/h2/src/main/org/h2/mvstore/type/ObjectDataType.java b/h2/src/main/org/h2/mvstore/type/ObjectDataType.java index 3b41c930d8..eab21c0d08 100644 --- a/h2/src/main/org/h2/mvstore/type/ObjectDataType.java +++ b/h2/src/main/org/h2/mvstore/type/ObjectDataType.java @@ -1358,11 +1358,9 @@ public int compare(Object aObj, Object bObj) { x = Integer.signum((((boolean[]) aObj)[i] ? 1 : 0) - (((boolean[]) bObj)[i] ? 1 : 0)); } else if (type == char.class) { - x = Integer.signum((((char[]) aObj)[i]) - - (((char[]) bObj)[i])); + x = Integer.signum(((char[]) aObj)[i] - ((char[]) bObj)[i]); } else if (type == short.class) { - x = Integer.signum((((short[]) aObj)[i]) - - (((short[]) bObj)[i])); + x = Integer.signum(((short[]) aObj)[i] - ((short[]) bObj)[i]); } else if (type == int.class) { int a = ((int[]) aObj)[i]; int b = ((int[]) bObj)[i]; diff --git a/h2/src/main/org/h2/security/AES.java b/h2/src/main/org/h2/security/AES.java index 24a73257f8..2644770f62 100644 --- a/h2/src/main/org/h2/security/AES.java +++ b/h2/src/main/org/h2/security/AES.java @@ -96,7 +96,7 @@ public void setKey(byte[] key) { encKey[e + 4] = encKey[e] ^ RCON[i] ^ (FS[(encKey[e + 3] >> 16) & 255] << 24) ^ (FS[(encKey[e + 3] >> 8) & 255] << 16) - ^ (FS[(encKey[e + 3]) & 255] << 8) + ^ (FS[encKey[e + 3] & 255] << 8) ^ FS[(encKey[e + 3] >> 24) & 255]; encKey[e + 5] = encKey[e + 1] ^ encKey[e + 4]; encKey[e + 6] = encKey[e + 2] ^ encKey[e + 5]; diff --git a/h2/src/main/org/h2/security/CipherFactory.java b/h2/src/main/org/h2/security/CipherFactory.java index 0477e9afa7..8096238bd6 100644 --- a/h2/src/main/org/h2/security/CipherFactory.java +++ b/h2/src/main/org/h2/security/CipherFactory.java @@ -141,7 +141,6 @@ public static Socket createSocket(InetAddress address, int port) */ public static ServerSocket createServerSocket(int port, InetAddress bindAddress) throws IOException { - ServerSocket socket = null; if (SysProperties.ENABLE_ANONYMOUS_TLS) { removeAnonFromLegacyAlgorithms(); } @@ -161,9 +160,7 @@ public static ServerSocket createServerSocket(int port, secureSocket.getSupportedCipherSuites()); secureSocket.setEnabledCipherSuites(list); } - - socket = secureSocket; - return socket; + return secureSocket; } /** diff --git a/h2/src/main/org/h2/security/auth/impl/StaticUserCredentialsValidator.java b/h2/src/main/org/h2/security/auth/impl/StaticUserCredentialsValidator.java index edee8de558..6296328dd8 100644 --- a/h2/src/main/org/h2/security/auth/impl/StaticUserCredentialsValidator.java +++ b/h2/src/main/org/h2/security/auth/impl/StaticUserCredentialsValidator.java @@ -5,6 +5,7 @@ */ package org.h2.security.auth.impl; +import java.nio.charset.StandardCharsets; import java.util.regex.Pattern; import org.h2.api.CredentialsValidator; @@ -36,7 +37,7 @@ public StaticUserCredentialsValidator(String userNamePattern,String password) { this.userNamePattern=Pattern.compile(userNamePattern.toUpperCase()); } salt=MathUtils.secureRandomBytes(256); - hashWithSalt=SHA256.getHashWithSalt(password.getBytes(), salt); + hashWithSalt=SHA256.getHashWithSalt(password.getBytes(StandardCharsets.UTF_8), salt); } @Override @@ -50,7 +51,7 @@ public boolean validateCredentials(AuthenticationInfo authenticationInfo) throws return password.equals(authenticationInfo.getPassword()); } return Utils.compareSecure(hashWithSalt, - SHA256.getHashWithSalt(authenticationInfo.getPassword().getBytes(), salt)); + SHA256.getHashWithSalt(authenticationInfo.getPassword().getBytes(StandardCharsets.UTF_8), salt)); } @Override diff --git a/h2/src/main/org/h2/server/pg/PgServerThread.java b/h2/src/main/org/h2/server/pg/PgServerThread.java index aba652af6a..4e243f8a8d 100644 --- a/h2/src/main/org/h2/server/pg/PgServerThread.java +++ b/h2/src/main/org/h2/server/pg/PgServerThread.java @@ -705,7 +705,7 @@ private void writeDataColumn(Value v, int pgType, boolean text) throws IOExcepti } case PgServer.PG_TYPE_DATE: writeInt(4); - writeInt((int) (toPostgreDays(((ValueDate) v).getDateValue()))); + writeInt((int) toPostgreDays(((ValueDate) v).getDateValue())); break; case PgServer.PG_TYPE_TIME: writeTimeBinary(((ValueTime) v).getNanos(), 8); diff --git a/h2/src/main/org/h2/server/web/WebServer.java b/h2/src/main/org/h2/server/web/WebServer.java index 73d17644da..70434179fb 100644 --- a/h2/src/main/org/h2/server/web/WebServer.java +++ b/h2/src/main/org/h2/server/web/WebServer.java @@ -522,8 +522,9 @@ void readTranslations(WebSession session, String language) { try { trace("translation: "+language); byte[] trans = getFile("_text_"+language+".prop"); - trace(" "+new String(trans)); - text = SortedProperties.fromLines(new String(trans, StandardCharsets.UTF_8)); + String s = new String(trans, StandardCharsets.UTF_8); + trace(" " + s); + text = SortedProperties.fromLines(s); // remove starting # (if not translated yet) for (Entry entry : text.entrySet()) { String value = (String) entry.getValue(); diff --git a/h2/src/main/org/h2/store/Data.java b/h2/src/main/org/h2/store/Data.java index 76136b935e..67316a0c7f 100644 --- a/h2/src/main/org/h2/store/Data.java +++ b/h2/src/main/org/h2/store/Data.java @@ -72,7 +72,7 @@ private void writeStringWithoutLength(char[] chars, int len) { buff[p++] = (byte) c; } else if (c >= 0x800) { buff[p++] = (byte) (0xe0 | (c >> 12)); - buff[p++] = (byte) (((c >> 6) & 0x3f)); + buff[p++] = (byte) ((c >> 6) & 0x3f); buff[p++] = (byte) (c & 0x3f); } else { buff[p++] = (byte) (0xc0 | (c >> 6)); diff --git a/h2/src/main/org/h2/table/InformationSchemaTableLegacy.java b/h2/src/main/org/h2/table/InformationSchemaTableLegacy.java index e55ec11929..59695ef8a2 100644 --- a/h2/src/main/org/h2/table/InformationSchemaTableLegacy.java +++ b/h2/src/main/org/h2/table/InformationSchemaTableLegacy.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.Types; @@ -1166,8 +1167,7 @@ public ArrayList generateRows(SessionLocal session, SearchRow first, Search String resource = "/org/h2/res/help.csv"; try { final byte[] data = Utils.getResource(resource); - final Reader reader = new InputStreamReader( - new ByteArrayInputStream(data)); + final Reader reader = new InputStreamReader(new ByteArrayInputStream(data), StandardCharsets.UTF_8); final Csv csv = new Csv(); csv.setLineCommentCharacter('#'); final ResultSet rs = csv.read(reader, null); diff --git a/h2/src/main/org/h2/table/Table.java b/h2/src/main/org/h2/table/Table.java index c2b5b14fbc..d194c64015 100644 --- a/h2/src/main/org/h2/table/Table.java +++ b/h2/src/main/org/h2/table/Table.java @@ -760,7 +760,7 @@ public Column getColumn(String columnName) { * Get the column with the given name. * * @param columnName the column name - * @param ifExists if (@code true) return {@code null} if column does not exist + * @param ifExists if {@code true} return {@code null} if column does not exist * @return the column * @throws DbException if the column was not found */ diff --git a/h2/src/main/org/h2/table/TableFilter.java b/h2/src/main/org/h2/table/TableFilter.java index 990467a718..cd0a952be6 100644 --- a/h2/src/main/org/h2/table/TableFilter.java +++ b/h2/src/main/org/h2/table/TableFilter.java @@ -964,7 +964,7 @@ public boolean hasDerivedColumnList() { * @param columnName * the column name * @param ifExists - * if (@code true) return {@code null} if column does not exist + * if {@code true} return {@code null} if column does not exist * @return the column * @throws DbException * if the column was not found and {@code ifExists} is diff --git a/h2/src/main/org/h2/tools/MultiDimension.java b/h2/src/main/org/h2/tools/MultiDimension.java index 7c694d576d..591348f6a6 100644 --- a/h2/src/main/org/h2/tools/MultiDimension.java +++ b/h2/src/main/org/h2/tools/MultiDimension.java @@ -310,7 +310,7 @@ private void addMortonRanges(ArrayList list, int[] min, int[] max, } private static int roundUp(int x, int blockSizePowerOf2) { - return (x + blockSizePowerOf2 - 1) & (-blockSizePowerOf2); + return (x + blockSizePowerOf2 - 1) & -blockSizePowerOf2; } private static int findMiddle(int a, int b) { diff --git a/h2/src/main/org/h2/util/MathUtils.java b/h2/src/main/org/h2/util/MathUtils.java index 2a84beb7ff..3edb1dec9e 100644 --- a/h2/src/main/org/h2/util/MathUtils.java +++ b/h2/src/main/org/h2/util/MathUtils.java @@ -44,7 +44,7 @@ private MathUtils() { * @return the rounded value */ public static int roundUpInt(int x, int blockSizePowerOf2) { - return (x + blockSizePowerOf2 - 1) & (-blockSizePowerOf2); + return (x + blockSizePowerOf2 - 1) & -blockSizePowerOf2; } /** @@ -58,7 +58,7 @@ public static int roundUpInt(int x, int blockSizePowerOf2) { * @return the rounded value */ public static long roundUpLong(long x, long blockSizePowerOf2) { - return (x + blockSizePowerOf2 - 1) & (-blockSizePowerOf2); + return (x + blockSizePowerOf2 - 1) & -blockSizePowerOf2; } private static synchronized SecureRandom getSecureRandom() { diff --git a/h2/src/main/org/h2/util/SortedProperties.java b/h2/src/main/org/h2/util/SortedProperties.java index 7989dd83ae..f7dfd7697a 100644 --- a/h2/src/main/org/h2/util/SortedProperties.java +++ b/h2/src/main/org/h2/util/SortedProperties.java @@ -16,12 +16,12 @@ import java.io.PrintWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.Map.Entry; import java.util.Properties; import java.util.TreeMap; -import java.util.Vector; import org.h2.store.fs.FileUtils; /** @@ -34,12 +34,12 @@ public class SortedProperties extends Properties { @Override public synchronized Enumeration

2.1.220	Windows Installer	Platform-Independent Zip
2.1.210	Windows Installer	Platform-Independent Zip

2.1.220	Windows Installer	Platform-Independent Zip
2.1.212	Windows Installer	Platform-Independent Zip
2.1.210	Windows Installer	+	+	+	+	+	+	+
FETCH	+	+	+	+	+	+	+
FILTER	CS	+	+	+	+
FOR	+	+	+	+	+	+	+
FOREIGN

2.1.214	Windows Installer	Platform-Independent Zip
2.1.212	Windows Installer	Platform-Independent Zip

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

LEGACY Compatibility Mode

DB2 Compatibility Mode

HSQLDB Compatibility Mode

MS SQL Server Compatibility Mode

Oracle Compatibility Mode

PostgreSQL Compatibility Mode

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Limits and Limitations

Data types

Data types

MySQL

SQLite

Firebird

Change Log

Next Version (unreleased)

Next Version 2.1.220 (2022-04-07)

Next Version (unreleased)

Version 2.0.202 (2021-11-25)

Version 1.4.200 (2019-10-14)

Next Version (unreleased)

Next Version 2.1.220 (2022-04-07)

Next Version 2.1.220 (2022-04-09)

Distribution

Next Version (unreleased)

SQLite

Change Log

Next Version (unreleased)

Next Version 2.1.212 (2022-04-09)

Distribution

Version ${version} (${versionDate})

Version 2.0.206 (2022-01-04)

Version 2.1.210 (2022-01-17)

Archive Downloads

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Next Version (unreleased)

Next Version 2.1.212 (2022-04-09)

Change Log

Next Version (unreleased)

DB2 Compatibility Mode

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Change Log

Next Version (unreleased)

Keywords / Reserved Words

Change Log

Next Version (unreleased)