Using expression builders

.gitignore

@@ -21,3 +21,4 @@ logs
 *.so
 *.log
 
+gradle.properties

cpg-core/src/main/java/de/fraunhofer/aisec/cpg/frontends/cpp/ExpressionHandler.kt

@@ -343,9 +343,9 @@ class ExpressionHandler(lang: CXXLanguageFrontend) :
         }
 
         return newMemberExpression(
+            ctx.fieldName.toString(),
             base,
             UnknownType.getUnknownType(language),
-            ctx.fieldName.toString(),
             if (ctx.isPointerDereference) "->" else ".",
             ctx.rawSignature
         )

cpg-core/src/main/java/de/fraunhofer/aisec/cpg/frontends/java/ExpressionHandler.java

@@ -381,11 +381,11 @@ private DeclarationStatement handleVariableDeclarationExpr(Expression expr) {
       MemberExpression memberExpression =
           newMemberExpression(
               this,
+              fieldAccessExpr.getName().getIdentifier(),
               base,
               fieldType,
-              fieldAccessExpr.getName().getIdentifier(),
-              ".", // there is only "." in java
-              fieldAccessExpr.toString());
+              "." // there is only "." in java
+              );
       memberExpression.setStaticAccess(true);
       return memberExpression;
     }
@@ -395,12 +395,7 @@ private DeclarationStatement handleVariableDeclarationExpr(Expression expr) {
     }
 
     return newMemberExpression(
-        this,
-        base,
-        fieldType,
-        fieldAccessExpr.getName().getIdentifier(),
-        ".",
-        fieldAccessExpr.toString());
+        this, fieldAccessExpr.getName().getIdentifier(), base, fieldType, ".");
   }
 
   private Literal handleLiteralExpression(Expression expr) {

cpg-core/src/main/java/de/fraunhofer/aisec/cpg/graph/ExpressionBuilder.kt

@@ -41,7 +41,7 @@ import de.fraunhofer.aisec.cpg.graph.types.UnknownType
 @JvmOverloads
 fun <T> MetadataProvider.newLiteral(
     value: T,
-    type: Type?,
+    type: Type? = UnknownType.getUnknownType(),
     code: String? = null,
     rawNode: Any? = null,
 ): Literal<T> {
@@ -114,7 +114,7 @@ fun MetadataProvider.newUnaryOperator(
 @JvmOverloads
 fun MetadataProvider.newNewExpression(
     code: String? = null,
-    type: Type?,
+    type: Type? = UnknownType.getUnknownType(),
     rawNode: Any? = null
 ): NewExpression {
     val node = NewExpression()
@@ -179,8 +179,8 @@ fun MetadataProvider.newConditionalExpression(
  */
 @JvmOverloads
 fun MetadataProvider.newKeyValueExpression(
-    key: Expression?,
-    value: Expression?,
+    key: Expression? = null,
+    value: Expression? = null,
     code: String? = null,
     rawNode: Any? = null
 ): KeyValueExpression {
@@ -238,10 +238,10 @@ fun MetadataProvider.newCompoundStatementExpression(
  */
 @JvmOverloads
 fun MetadataProvider.newCallExpression(
-    callee: Expression?,
-    fqn: String?,
+    callee: Expression? = null,
+    fqn: String? = null,
     code: String? = null,
-    template: Boolean,
+    template: Boolean = false,
     rawNode: Any? = null
 ): CallExpression {
     val node = CallExpression()
@@ -288,10 +288,10 @@ fun MetadataProvider.newMemberCallExpression(
     fqn: String?,
     base: Expression?,
     member: Node?,
-    operatorCode: String?,
+    operatorCode: String? = ".",
     code: String? = null,
     rawNode: Any? = null
-): CallExpression {
+): MemberCallExpression {
     val node = MemberCallExpression()
     node.applyMetadata(this, rawNode, code)
 
@@ -313,10 +313,10 @@ fun MetadataProvider.newMemberCallExpression(
  */
 @JvmOverloads
 fun MetadataProvider.newMemberExpression(
-    base: Expression,
-    memberType: Type?,
     name: String?,
-    operatorCode: String?,
+    base: Expression,
+    memberType: Type? = UnknownType.getUnknownType(),
+    operatorCode: String? = ".",
     code: String? = null,
     rawNode: Any? = null
 ): MemberExpression {

cpg-language-go/src/main/golang/basic_types.go

@@ -41,12 +41,21 @@ func NewString(s string) *jnigi.ObjectRef {
 	return o
 }
 
+func NewBoolean(b bool) *jnigi.ObjectRef {
+	// TODO: Use Boolean.valueOf
+	o, err := env.NewObject("java/lang/Boolean", b)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return o
+}
+
 func NewInteger(i int) *jnigi.ObjectRef {
 	// TODO: Use Integer.valueOf
 	o, err := env.NewObject("java/lang/Integer", i)
 	if err != nil {
 		log.Fatal(err)
-
 	}
 
 	return o
@@ -57,7 +66,6 @@ func NewDouble(d float64) *jnigi.ObjectRef {
 	o, err := env.NewObject("java/lang/Double", d)
 	if err != nil {
 		log.Fatal(err)
-
 	}
 
 	return o

cpg-language-go/src/main/golang/expressions.go

@@ -42,6 +42,10 @@ func (e *Expression) GetClassName() string {
 	return "de/fraunhofer/aisec/cpg/graph/statements/expressions/Expression"
 }
 
+func (e *Expression) Cast(className string) *jnigi.ObjectRef {
+	return (*jnigi.ObjectRef)(e).Cast(className)
+}
+
 func (e *Expression) IsArray() bool {
 	return false
 }