backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

pass the parameters of a lamba expression to the lambda type

Browse Source
This commit is contained in:
Volker Berlin 2021-02-28 22:20:49 +01:00
parent d3261149e6
commit 66ee596fcf
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/de/inetsoftware/jwebassembly/module/TypeManager.java
View File

@ -369,6 +369,8 @@ public class TypeManager {
* *
* @param typeName * @param typeName
* the name (className) of the lambda class * the name (className) of the lambda class
* @param params
* the parameters of the constructor and type fields
* @param interfaceType * @param interfaceType
* the implemented interface * the implemented interface
* @param methodName * @param methodName
@ -377,10 +379,10 @@ public class TypeManager {
* the name of the implemented method in the interface * the name of the implemented method in the interface
* @return the type * @return the type
*/ */
StructType lambdaType( String typeName, StructType interfaceType, FunctionName methodName, String interfaceMethodName ) { LambdaType lambdaType( String typeName, ArrayList<AnyType> params, StructType interfaceType, FunctionName methodName, String interfaceMethodName ) {
StructType type = structTypes.get( typeName ); LambdaType type = (LambdaType)structTypes.get( typeName );
if( type == null ) { if( type == null ) {
type = new LambdaType( typeName, interfaceType, methodName, interfaceMethodName, this ); type = new LambdaType( typeName, params, interfaceType, methodName, interfaceMethodName, this );
structTypes.put( typeName, type ); structTypes.put( typeName, type );
} }
@ -656,6 +658,7 @@ public class TypeManager {
allNeededFields = new HashSet<>(); allNeededFields = new HashSet<>();
listStructFields( "java/lang/Object", functions, types, classFileLoader, allNeededFields ); listStructFields( "java/lang/Object", functions, types, classFileLoader, allNeededFields );
LambdaType lambda = (LambdaType)this; LambdaType lambda = (LambdaType)this;
fields.addAll( lambda.getParamFields() );
List<FunctionName> iMethods = new ArrayList<>(); List<FunctionName> iMethods = new ArrayList<>();
iMethods.add( lambda.getLambdaMethod() ); iMethods.add( lambda.getLambdaMethod() );
interfaceMethods.put( lambda.getInterfaceType(), iMethods ); interfaceMethods.put( lambda.getInterfaceType(), iMethods );
@ -1088,17 +1091,21 @@ public class TypeManager {
*/ */
class LambdaType extends StructType { class LambdaType extends StructType {
private StructType interfaceType; private ArrayList<NamedStorageType> paramFields;
private FunctionName methodName; private StructType interfaceType;
private String interfaceMethodName; private FunctionName methodName;
private String interfaceMethodName;
/** /**
* Create a lambda type * Create a lambda type
* *
* @param name * @param name
* the Java class name * the Lambda Java class name
* @param params
* the parameters of the constructor and type fields
* @param interfaceType * @param interfaceType
* the implemented interface type * the implemented interface type
* @param methodName * @param methodName
@ -1108,13 +1115,26 @@ public class TypeManager {
* @param manager * @param manager
* the manager which hold all StructTypes * the manager which hold all StructTypes
*/ */
LambdaType( String name, StructType interfaceType, FunctionName methodName, String interfaceMethodName, TypeManager manager ) { LambdaType( String name, ArrayList<AnyType> params, StructType interfaceType, FunctionName methodName, String interfaceMethodName, TypeManager manager ) {
super( name, StructTypeKind.lambda, manager ); super( name, StructTypeKind.lambda, manager );
this.paramFields = new ArrayList<>( params.size() );
for( int i = 0; i < params.size(); i++ ) {
paramFields.add( new NamedStorageType( params.get( i ), "", "arg$" + (i+1) ) );
}
this.interfaceType = interfaceType; this.interfaceType = interfaceType;
this.methodName = methodName; this.methodName = methodName;
this.interfaceMethodName = interfaceMethodName; this.interfaceMethodName = interfaceMethodName;
} }
/**
* The parameters of the constructor
*
* @return the parameters
*/
ArrayList<NamedStorageType> getParamFields() {
return paramFields;
}
/** /**
* The implemented interface type * The implemented interface type
* *

23
src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java
View File

@ -35,6 +35,7 @@ import de.inetsoftware.classparser.MethodInfo;
import de.inetsoftware.jwebassembly.WasmException; import de.inetsoftware.jwebassembly.WasmException;
import de.inetsoftware.jwebassembly.javascript.NonGC; import de.inetsoftware.jwebassembly.javascript.NonGC;
import de.inetsoftware.jwebassembly.module.StackInspector.StackValue; import de.inetsoftware.jwebassembly.module.StackInspector.StackValue;
import de.inetsoftware.jwebassembly.module.TypeManager.LambdaType;
import de.inetsoftware.jwebassembly.module.TypeManager.StructType; import de.inetsoftware.jwebassembly.module.TypeManager.StructType;
import de.inetsoftware.jwebassembly.module.WasmInstruction.Type; import de.inetsoftware.jwebassembly.module.WasmInstruction.Type;
import de.inetsoftware.jwebassembly.wasm.AnyType; import de.inetsoftware.jwebassembly.wasm.AnyType;
@ -866,14 +867,24 @@ public abstract class WasmCodeBuilder {
ConstantMethodRef implMethod = method.getImplMethod(); ConstantMethodRef implMethod = method.getImplMethod();
FunctionName name = new FunctionName( implMethod ); FunctionName name = new FunctionName( implMethod );
functions.markAsNeeded( name ); functions.markAsNeeded( name );
String typeName = implMethod.getClassName() + "$$" + implMethod.getName() + "/"; String lambdaTypeName = implMethod.getClassName() + "$$" + implMethod.getName() + "/" + Math.abs( name.hashCode() );
ValueTypeParser parser = new ValueTypeParser( factorySignature, types ); ValueTypeParser parser = new ValueTypeParser( factorySignature, types );
while( parser.next() != null ) { ArrayList<AnyType> params = new ArrayList<>();
// skip parameters TODO do {
} AnyType param = parser.next();
if( param == null ) {
break;
}
params.add( param );
} while( true );
StructType interfaceType = (StructType)parser.next(); StructType interfaceType = (StructType)parser.next();
StructType type = types.lambdaType( typeName, interfaceType, name, interfaceMethodName ); LambdaType type = types.lambdaType( lambdaTypeName, params, interfaceType, name, interfaceMethodName );
addStructInstruction( StructOperator.NEW_DEFAULT, typeName, null, javaCodePos, lineNumber ); addStructInstruction( StructOperator.NEW_DEFAULT, lambdaTypeName, null, javaCodePos, lineNumber );
for( NamedStorageType field : type.getParamFields() ) {
addDupInstruction( javaCodePos, lineNumber );
instructions.add( new WasmStructInstruction( StructOperator.SET, lambdaTypeName, field, javaCodePos, lineNumber, types ) );
}
} }
/** /**