aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2011-06-06 12:53:35 -0700
committerShawn O. Pearce <sop@google.com>2011-06-06 12:53:35 -0700
commitace1c5de9f32ac57c7d385e8ca07c11c752eb67b (patch)
treebc382b51f7627216b74837c3cf36bcab8e601314
parent339cb6cae1053c0cec8c34bd3ee1a66ff6ee7b42 (diff)
downloadprolog-cafe-ace1c5de9f32ac57c7d385e8ca07c11c752eb67b.tar.gz
Move hashManager init to Prolog constructor
Otherwise it gets built too late, preventing users from registering their own hashed objects in the hash manager before package init.
-rw-r--r--src/lang/Prolog.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lang/Prolog.java b/src/lang/Prolog.java
index 638703d..b74bfd8 100644
--- a/src/lang/Prolog.java
+++ b/src/lang/Prolog.java
@@ -90,7 +90,7 @@ public final class Prolog {
protected HashtableOfTerm streamManager;
/** Hashtable for managing internal databases. */
- protected HashtableOfTerm hashManager;
+ protected final HashtableOfTerm hashManager;
/** Name of the builtin package. */
public static final String BUILTIN = "com.googlecode.prolog_cafe.builtin";
@@ -117,6 +117,7 @@ public final class Prolog {
cont = null;
trail = new Trail();
stack = new ChoicePointStack(trail);
+ hashManager = new HashtableOfTerm();
}
/**
@@ -128,7 +129,6 @@ public final class Prolog {
* <li><code>userOutput</code>
* <li><code>userError</code>
* <li><code>copyHash</code>
- * <li><code>hashManager</code>
* <li><code>streamManager</code>
* </ul>
*/
@@ -144,7 +144,6 @@ public final class Prolog {
userError = new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.err)), true);
copyHash = new HashMap<VariableTerm,VariableTerm>();
- hashManager = new HashtableOfTerm();
streamManager = new HashtableOfTerm();
streamManager.put(SYM_USERINPUT, new JavaObjectTerm(userInput));