From 808ee99991bfd2fe60397cc510f8b8ddf0f60c3a Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Wed, 18 Jan 2012 15:36:23 -0800
Subject: [PATCH] Use _ instead of $ for implementation-detail Prolog
 predicates

Some non-Maven build systems can't handle $ in filenames, and this was
just an arbitrary convention, so it's harmless to change.

Change-Id: Ifae89dcc241f1859d2376df7fe226da766fc3011
---
 ...d_commit_labels_1.java => PRED__load_commit_labels_1.java} | 4 ++--
 ...$user_label_range_4.java => PRED__user_label_range_4.java} | 4 ++--
 gerrit-server/src/main/prolog/gerrit_common.pl                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename gerrit-server/src/main/java/gerrit/{PRED_$load_commit_labels_1.java => PRED__load_commit_labels_1.java} (96%)
 rename gerrit-server/src/main/java/gerrit/{PRED_$user_label_range_4.java => PRED__user_label_range_4.java} (96%)

diff --git a/gerrit-server/src/main/java/gerrit/PRED_$load_commit_labels_1.java b/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java
similarity index 96%
rename from gerrit-server/src/main/java/gerrit/PRED_$load_commit_labels_1.java
rename to gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java
index eff444e8d1..8b35e129ca 100644
--- a/gerrit-server/src/main/java/gerrit/PRED_$load_commit_labels_1.java
+++ b/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java
@@ -23,14 +23,14 @@ import com.googlecode.prolog_cafe.lang.SymbolTerm;
 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 {
+class PRED__load_commit_labels_1 extends Predicate.P1 {
   private static final long serialVersionUID = 1L;
 
   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) {
+  PRED__load_commit_labels_1(Term a1, Operation n) {
     arg1 = a1;
     cont = n;
   }
diff --git a/gerrit-server/src/main/java/gerrit/PRED_$user_label_range_4.java b/gerrit-server/src/main/java/gerrit/PRED__user_label_range_4.java
similarity index 96%
rename from gerrit-server/src/main/java/gerrit/PRED_$user_label_range_4.java
rename to gerrit-server/src/main/java/gerrit/PRED__user_label_range_4.java
index 2fdf5ab76e..68f9bf64da 100644
--- a/gerrit-server/src/main/java/gerrit/PRED_$user_label_range_4.java
+++ b/gerrit-server/src/main/java/gerrit/PRED__user_label_range_4.java
@@ -37,10 +37,10 @@ import com.googlecode.prolog_cafe.lang.Term;
  *   '$user_label_range'(+Label, +CurrentUser, -Min, -Max)
  * </pre>
  */
-class PRED_$user_label_range_4 extends Predicate.P4 {
+class PRED__user_label_range_4 extends Predicate.P4 {
   private static final long serialVersionUID = 1L;
 
-  PRED_$user_label_range_4(Term a1, Term a2, Term a3, Term a4, Operation n) {
+  PRED__user_label_range_4(Term a1, Term a2, Term a3, Term a4, Operation n) {
     arg1 = a1;
     arg2 = a2;
     arg3 = a3;
diff --git a/gerrit-server/src/main/prolog/gerrit_common.pl b/gerrit-server/src/main/prolog/gerrit_common.pl
index 42ad519dc9..634f8eadf9 100644
--- a/gerrit-server/src/main/prolog/gerrit_common.pl
+++ b/gerrit-server/src/main/prolog/gerrit_common.pl
@@ -70,7 +70,7 @@ get_commit_labels(Rs) :-
   hash_get(commit_labels, '$all', Rs)
   .
 get_commit_labels(Rs) :-
-  '$load_commit_labels'(Rs),
+  '_load_commit_labels'(Rs),
   set_commit_labels(Rs).
 
 set_commit_labels(Rs) :-
@@ -101,7 +101,7 @@ user_label_range(Label, Who, Min, Max) :-
   Who = user(_), !,
   atom(Label),
   current_user(Who, User),
-  '$user_label_range'(Label, User, Min, Max).
+  '_user_label_range'(Label, User, Min, Max).
 user_label_range(Label, test_user(Name), Min, Max) :-
   clause(user:test_grant(Label, test_user(Name), range(Min, Max)), _)
   .