xmas

C/stack.c

@@ -2134,7 +2134,7 @@ static void shortstack( choiceptr b_ptr, CELL * env_ptr , buf_struct_t *bufp) {
   void DumpActiveGoals(USES_REGS1) {
     /* try to dump active goals */
     void *ep = YENV; /* and current environment		  */
-   void *cp;
+    void *cp ;
     PredEntry *pe;
     struct buf_struct_t buf0, *bufp = &buf0;
 

C/yap-args.c

@@ -175,7 +175,7 @@ static bool load_file(const char *b_file USES_REGS) {
   __android_log_print(
 		      ANDROID_LOG_INFO, "YAPDroid", "done init_consult %s ",b_file);
   if (c_stream < 0) {
-    fprintf(stderr, "[ FATAL ERROR: could not open file %s ]\n", b_file);
+    fprintf(stderr, "[ FATAL ERROR: could not open file %s\n", b_file);
     pop_text_stack(lvl);
     exit(1);
   }
@@ -185,7 +185,7 @@ static bool load_file(const char *b_file USES_REGS) {
   }
   __android_log_print(
 		      ANDROID_LOG_INFO, "YAPDroid", "do reset %s ",b_file);
-
+  t = 0;
   while (t != TermEof) {
     CACHE_REGS
           YAP_Reset(YAP_FULL_RESET, false);

packages/jpl/src/c/jpl.c

@@ -1826,7 +1826,7 @@ jni_create_jvm_c(
     JNIEnv		*env;
 
     JPL_DEBUG(1, Sdprintf( "[creating JVM with 'java.class.path=%s']\n", classpath));
-    vm_args.version = JNI_VERSION_1_6zzzz;	    /* "Java 1.2 please" */
+    vm_args.version = JNI_VERSION_1_6;	    /* "Java 1.2 please" */
     if ( classpath )
 		{
 			cpoptp = (char *)malloc(strlen(classpath) + strlen("-Djava.class.path=")+1);

packages/python/pypreds.c

@@ -1,4 +1,15 @@
 
+
+
+
+
+
+
+
+
+
+
+
 #include "Yap.h"
 
 #include "py4yap.h"

pl/android.yap

@@ -1,8 +1,6 @@
 
-%:- start_low_level_trace.
-
-%:- module(android,
-%	[text_to_query/2]).
+:- module(android,
+	[text_to_query/2]).
 	
 :- initialization(yap_flag(verbose,_,normal)).
 

pl/undefined.yap

@@ -97,8 +97,7 @@ undefined_query(G0, M0, Cut) :-
 
 % undef handler
 '$undefp'([M0|G0],MG) :-
-    setup_call_cleanup(
-    % make sure we do not loop on undefined predicates
+x    % make sure we do not loop on undefined predicates
         '$undef_setup'(Action,Debug,Current),
         ('$get_undefined_predicates'(M0:G0, MG) 
         ->