Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relational-rags
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
relational-rags
Commits
5808ffc1
Commit
5808ffc1
authored
6 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
improve uid handling.
parent
001af931
No related branches found
No related tags found
1 merge request
!1
Mquat2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/jastadd/Backend.jadd
+35
-39
35 additions, 39 deletions
src/main/jastadd/Backend.jadd
src/main/java/org/jastadd/relast/compiler/Compiler.java
+0
-1
0 additions, 1 deletion
src/main/java/org/jastadd/relast/compiler/Compiler.java
with
35 additions
and
40 deletions
src/main/jastadd/Backend.jadd
+
35
−
39
View file @
5808ffc1
...
@@ -908,8 +908,6 @@ aspect NameResolutionHelper {
...
@@ -908,8 +908,6 @@ aspect NameResolutionHelper {
generateDirectedContextDependentNameResolution(sb);
generateDirectedContextDependentNameResolution(sb);
}
}
public void ManyRelationComponent.generateContextDependentNameResolution(StringBuilder sb) {
public void ManyRelationComponent.generateContextDependentNameResolution(StringBuilder sb) {
System.out.println("serializer: " + serializer);
System.out.println("ResolverHelper: " + resolverHelper);
if (serializer && !resolverHelper) {
if (serializer && !resolverHelper) {
sb.append(ind(1) + ofTypeDecl() + " " + toTypeDecl() + ".resolve" + nameCapitalized() + "ByToken(String id, int position) {\n");
sb.append(ind(1) + ofTypeDecl() + " " + toTypeDecl() + ".resolve" + nameCapitalized() + "ByToken(String id, int position) {\n");
...
@@ -1063,8 +1061,8 @@ aspect Serializer {
...
@@ -1063,8 +1061,8 @@ aspect Serializer {
sb.append(ind(4) + "g.writeObjectFieldStart(fieldName);\n");
sb.append(ind(4) + "g.writeObjectFieldStart(fieldName);\n");
sb.append(ind(3) + "}\n");
sb.append(ind(3) + "}\n");
sb.append(ind(3) + "g.writeStringField(\"" + jsonTypeKey + "\", \"" + getID() + "\");\n");
sb.append(ind(3) + "g.writeStringField(\"" + jsonTypeKey + "\", \"" + getID() + "\");\n");
sb.append(ind(3) + "if (
__ui
d() == null) throw new SerializationException(\"The unique identifier of " + getID() + " is missing.\");\n");
sb.append(ind(3) + "if (
unique$I
d() == null) throw new SerializationException(\"The unique identifier of " + getID() + " is missing.\");\n");
sb.append(ind(3) + "g.writeStringField(\"id\",
__ui
d());\n");
sb.append(ind(3) + "g.writeStringField(\"id\",
unique$I
d());\n");
if (componentsTransitive().size() > 0) {
if (componentsTransitive().size() > 0) {
sb.append(ind(3) + "g.writeObjectFieldStart(\"children\");\n");
sb.append(ind(3) + "g.writeObjectFieldStart(\"children\");\n");
for (Component child : componentsTransitive()) {
for (Component child : componentsTransitive()) {
...
@@ -1167,18 +1165,18 @@ aspect Serializer {
...
@@ -1167,18 +1165,18 @@ aspect Serializer {
public void OneRelationComponent.serialize(StringBuilder sb, int indent) {
public void OneRelationComponent.serialize(StringBuilder sb, int indent) {
if (useJastAddNames){
if (useJastAddNames){
sb.append(ind(indent) + "g.writeStringField(\""+getID()+"\", get" + getID() + "().
__ui
d());\n");
sb.append(ind(indent) + "g.writeStringField(\""+getID()+"\", get" + getID() + "().
unique$I
d());\n");
} else {
} else {
sb.append(ind(indent) + "g.writeStringField(\""+getID()+"\", " + getID() + "().
__ui
d());\n");
sb.append(ind(indent) + "g.writeStringField(\""+getID()+"\", " + getID() + "().
unique$I
d());\n");
}
}
}
}
public void OptionalRelationComponent.serialize(StringBuilder sb, int indent) {
public void OptionalRelationComponent.serialize(StringBuilder sb, int indent) {
sb.append(ind(indent) + "if (has" + nameCapitalized() + "()) {\n");
sb.append(ind(indent) + "if (has" + nameCapitalized() + "()) {\n");
if (useJastAddNames){
if (useJastAddNames){
sb.append(ind(indent + 1) + "g.writeStringField(\"" + getID() + "\", get" + getID() + "().
__ui
d());\n");
sb.append(ind(indent + 1) + "g.writeStringField(\"" + getID() + "\", get" + getID() + "().
unique$I
d());\n");
} else {
} else {
sb.append(ind(indent + 1) + "g.writeStringField(\"" + getID() + "\", " + getID() + "().
__ui
d());\n");
sb.append(ind(indent + 1) + "g.writeStringField(\"" + getID() + "\", " + getID() + "().
unique$I
d());\n");
}
}
sb.append(ind(indent) + "}\n");
sb.append(ind(indent) + "}\n");
}
}
...
@@ -1190,7 +1188,7 @@ aspect Serializer {
...
@@ -1190,7 +1188,7 @@ aspect Serializer {
} else {
} else {
sb.append(ind(indent) + "for (" + ofTypeDecl().getID() + " child : " + getID() + "()) {\n");
sb.append(ind(indent) + "for (" + ofTypeDecl().getID() + " child : " + getID() + "()) {\n");
}
}
sb.append(ind(indent + 1) + "g.writeString(child.
__ui
d());\n");
sb.append(ind(indent + 1) + "g.writeString(child.
unique$I
d());\n");
sb.append(ind(indent) + "}\n");
sb.append(ind(indent) + "}\n");
sb.append(ind(indent) + "g.writeEndArray();\n");
sb.append(ind(indent) + "g.writeEndArray();\n");
}
}
...
@@ -1227,7 +1225,7 @@ aspect Serializer {
...
@@ -1227,7 +1225,7 @@ aspect Serializer {
// deserialize id
// deserialize id
sb.append(ind(2) + "if (node.has(\"id\")) {\n");
sb.append(ind(2) + "if (node.has(\"id\")) {\n");
sb.append(ind(3) + "element.
__ui
d = node.get(\"id\").asText();\n");
sb.append(ind(3) + "element.
unique$I
d = node.get(\"id\").asText();\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "}\n");
// deserialize containment children
// deserialize containment children
...
@@ -1339,55 +1337,53 @@ aspect Serializer {
...
@@ -1339,55 +1337,53 @@ aspect Serializer {
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "}\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "}\n");
sb.append("\n");
sb.append("\n");
sb.append(ind(1) + "protected String ASTNode.
__ui
d = null;\n");
sb.append(ind(1) + "protected String ASTNode.
unique$I
d = null;\n");
sb.append("\n");
sb.append("\n");
sb.append(ind(1) + "protected String ASTNode.
__ui
d() {\n");
sb.append(ind(1) + "protected String ASTNode.
unique$I
d() {\n");
sb.append(ind(2) + "String customUID = customID();\n");
sb.append(ind(2) + "String customUID = customID();\n");
sb.append(ind(2) + "if (customUID == null) {\n");
sb.append(ind(2) + "if (customUID == null) {\n");
sb.append(ind(3) + "if (
__ui
d == null) {\n");
sb.append(ind(3) + "if (
unique$I
d == null) {\n");
sb.append(ind(4) + "
__ui
d = UIDProvider.getUID();\n");
sb.append(ind(4) + "
unique$I
d = UIDProvider.getUID();\n");
sb.append(ind(3) + "}\n");
sb.append(ind(3) + "}\n");
sb.append(ind(3) + "return
__ui
d;\n");
sb.append(ind(3) + "return
unique$I
d;\n");
sb.append(ind(2) + "} else {\n");
sb.append(ind(2) + "} else {\n");
sb.append(ind(3) + "return customUID;\n");
sb.append(ind(3) + "return customUID;\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "}\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "}\n");
sb.append("\n");
sb.append("\n");
sb.append(ind(1) + "protected String ASTNode.customID() {\n");
sb.append(ind(1) + "protected String ASTNode.customID() {\n");
sb.append(ind(
2
) + "return null;\n");
sb.append(ind(
1
) + "
return null;\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "}\n");
sb.append("\n");
if (serializer) {
sb.append(ind(1) + "ASTNode ASTNode.globallyResolveASTNodeByUID(String uid) {\n");
sb.append(ind(1) + "ASTNode ASTNode.globallyResolveASTNodeByUID(String uid) {\n");
sb.append(ind(2) + "if (getParent() == null) {\n");
sb.append(ind(2) + "if (getParent() == null) {\n");
sb.append(ind(3) + "return
__
uidMap().get(uid);\n");
sb.append(ind(3) + "return uid
$
Map().get(uid)
.get()
;\n");
sb.append(ind(2) + "} else {\n");
sb.append(ind(2) + "} else {\n");
sb.append(ind(3) + "return getParent().globallyResolveASTNodeByUID(uid);\n");
sb.append(ind(3) + "return getParent().globallyResolveASTNodeByUID(uid);\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "}\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "}\n");
}
sb.append("\n");
sb.append(ind(1) + "java.util.Map<String, java.lang.ref.WeakReference<ASTNode>> ASTNode.uid$Map;\n");
sb.append(ind(1) + "syn java.util.Map<String, ASTNode> ASTNode.__uidMap() {\n");
sb.append("\n");
sb.append(ind(2) + "return(__uidMap(new java.util.HashMap()));\n");
sb.append(ind(1) + "java.util.Map<String, java.lang.ref.WeakReference<ASTNode>> ASTNode.uid$Map() {\n");
sb.append(ind(2) + "if (uid$Map == null) {\n");
sb.append(ind(3) + "uid$Map = uid$Map(new java.util.HashMap());\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "return uid$Map;\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "protected java.util.Map<String, java.lang.ref.WeakReference<ASTNode>> ASTNode.uid$Map(java.util.Map<String, java.lang.ref.WeakReference<ASTNode>> map) {\n");
sb.append(ind(1) + "protected java.util.Map<String, ASTNode> ASTNode.__uidMap(java.util.Map<String, ASTNode> map) {\n");
sb.append(ind(2) + "if (!(this instanceof " + jastAddListType + " || this instanceof Opt)) {\n");
sb.append(ind(2) + "if (!(this instanceof " + jastAddListType + " || this instanceof Opt)) {\n");
sb.append(ind(3) + "if (map.keySet().contains(__uid())) {\n");
sb.append(ind(3) + "if (map.keySet().contains(unique$Id())) {\n");
sb.append(ind(4) + "throw new RuntimeException(new SerializationException(\"UID \" + this.__uid() + \" is assigned to both " +
sb.append(ind(4) + "throw new RuntimeException(new SerializationException(\"UID \" + this.unique$Id() + \" is assigned to both \" + this.getClass().getSimpleName() + \":\" + this.hashCode() + \" and \" + map.get(unique$Id()).getClass().getSimpleName() + \":\" + map.get(unique$Id()).hashCode()));\n");
"\" + this.getClass().getSimpleName() + \":\" + this.hashCode() + \" and " +
"\" + map.get(__uid()).getClass().getSimpleName() + \":\" + map.get(__uid()).hashCode()));\n");
sb.append(ind(3) + "} else {\n");
sb.append(ind(3) + "} else {\n");
sb.append(ind(4) + "map.put(this.
__uid,
this);\n");
sb.append(ind(4) + "map.put(this.
unique$Id, new java.lang.ref.WeakReference(
this)
)
;\n");
sb.append(ind(3) + "}\n");
sb.append(ind(3) + "}\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "for (ASTNode child : astChildren()) {\n");
sb.append(ind(2) + "for (ASTNode child : astChildren()) {\n");
sb.append(ind(3) + "child.
__
uidMap(map);\n");
sb.append(ind(3) + "child.uid
$
Map(map);\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "}\n");
sb.append(ind(2) + "return map;\n");
sb.append(ind(2) + "return map;\n");
sb.append(ind(1) + "}\n");
sb.append(ind(1) + "}\n");
sb.append("}\n");
sb.append("}\n");
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/jastadd/relast/compiler/Compiler.java
+
0
−
1
View file @
5808ffc1
...
@@ -69,7 +69,6 @@ public class Compiler {
...
@@ -69,7 +69,6 @@ public class Compiler {
}
}
if
(
optionUseJastaddNames
.
isSet
())
{
if
(
optionUseJastaddNames
.
isSet
())
{
System
.
out
.
println
(
"Using JastAdd names"
);
ASTNode
.
useJastAddNames
=
true
;
ASTNode
.
useJastAddNames
=
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment