opendev/gerrit
Code Issues Proposed changes

Adapt to latest PrologCafe snapshot

Browse Source 
I changed around some of the APIs in PrologCafe to make the use of
SymbolTerm safer in a shared environment.

Change-Id: I182c8c6fad78598749a75a1b45ad264c500ab5d5
This commit is contained in:
Shawn O. Pearce
2011-06-15 11:42:28 -07:00
parent 1418b1beb0
commit dd7a88b074
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/gerrit/PRED_$load_commit_labels_1.java
View File

@@ -24,9 +24,9 @@ import com.googlecode.prolog_cafe.lang.Term;
/** Exports list of {@code commit_label( label('Code-Review', 2), user(12345789) )}. */
class PRED_$load_commit_labels_1 extends Predicate.P1 {
private static final SymbolTerm sym_commit_label = SymbolTerm.makeSymbol("commit_label", 2);
private static final SymbolTerm sym_label = SymbolTerm.makeSymbol("label", 2);
private static final SymbolTerm sym_user = SymbolTerm.makeSymbol("user", 1);
private static final SymbolTerm sym_commit_label = SymbolTerm.intern("commit_label", 2);
private static final SymbolTerm sym_label = SymbolTerm.intern("label", 2);
private static final SymbolTerm sym_user = SymbolTerm.intern("user", 1);
PRED_$load_commit_labels_1(Term a1, Operation n) {
arg1 = a1;
@@ -57,7 +57,7 @@ class PRED_$load_commit_labels_1 extends Predicate.P1 {
StructureTerm labelTerm = new StructureTerm(
sym_label,
SymbolTerm.makeSymbol(t.getCategory().getLabelName()),
SymbolTerm.intern(t.getCategory().getLabelName()),
new IntegerTerm(a.getValue()));
StructureTerm userTerm = new StructureTerm(

8
gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java
View File

@@ -68,14 +68,14 @@ class PRED_get_legacy_approval_types_1 extends Predicate.P1 {
return cont;
}
static final SymbolTerm symApprovalType = SymbolTerm.makeSymbol(
static final SymbolTerm symApprovalType = SymbolTerm.intern(
"approval_type", 5);
static Term export(ApprovalType type) {
return new StructureTerm(symApprovalType,
SymbolTerm.makeSymbol(type.getCategory().getLabelName()),
SymbolTerm.makeSymbol(type.getCategory().getId().get()),
SymbolTerm.makeSymbol(type.getCategory().getFunctionName()),
SymbolTerm.intern(type.getCategory().getLabelName()),
SymbolTerm.intern(type.getCategory().getId().get()),
SymbolTerm.intern(type.getCategory().getFunctionName()),
new IntegerTerm(type.getMin().getValue()),
new IntegerTerm(type.getMax().getValue()));
}