Skip to content

JMEOS v1.3 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheNotoriousB wants to merge 1 commit into
base: main
Choose a base branch
from
Open

JMEOS v1.3 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,450 changes: 4,450 additions & 0 deletions hs_err_pid17967.log
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 36 additions & 9 deletions src/main/java/builder/FunctionsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
package builder;

import utils.BuilderUtils;
import utils.Pair;

import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.HashSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import utils.BuilderUtils;
import utils.Pair;

/**
* Class used to generate the functions from the MEOS library.
* Run with directly with java through the main class
Expand Down Expand Up @@ -159,6 +166,7 @@ private static HashMap<String, String> buildEquivalentTypes() {
types.put("Pointer\\[\\]", "Pointer"); // Keep this line, otherwise operand error in JNR-FFI
types.put("bool", "boolean");
types.put("float", "float");
types.put("float8", "double");
types.put("double", "double");
types.put("void", "void");
types.put("int", "int");
Expand All @@ -184,6 +192,20 @@ private static HashMap<String, String> buildEquivalentTypes() {
types.put("size_t", "long");
types.put("interpType", "int"); // enum in C
//types.put("\\char **","Pointer");

// Nouveaux types pour 1.3
types.put("DateADT", "int");
types.put("TimeADT", "long");
types.put("Timestamp", "long");
types.put("TimestampTz", "long");
types.put("TimeOffset", "long");
types.put("fsec_t", "int");
types.put("Datum", "long");
types.put("uintptr_t", "long");

types.put("OffsetDateTime", "OffsetDateTime");
types.put("LocalDateTime", "LocalDateTime");


return types;
}
Expand Down Expand Up @@ -506,7 +528,8 @@ public interface MeosLibrary {
*/
private StringBuilder generateFunctions(String filePath, boolean performTypesConversion) {
var builder = new StringBuilder();

Set<String> seen = new HashSet<>();

BuilderUtils.readFileLines(filePath, line -> {
line = performTypeConversion(line);

Expand All @@ -523,11 +546,15 @@ private StringBuilder generateFunctions(String filePath, boolean performTypesCon
/* Perform equivalent type conversion */
line = BuilderUtils.replaceTypes(equivalentTypes, line);
unsupportedEquivalentTypes.addAll(getUnsupportedTypes(line, equivalentTypes).stream().filter(type -> !unsupportedEquivalentTypes.contains(type)).toList());

builder.append(BuilderUtils.formattingLine(line, "", "\n"));

String fnName = BuilderUtils.extractFunctionName(line);
int arity = BuilderUtils.extractParamTypesAndNames(line).size();
String key = fnName + "#" + arity;

if (seen.add(key)){
builder.append(line).append("\n");
}
});
return builder;
}


}
Loading