===================================================================
RCS file: /home/cvs/OpenXM/src/k097/k2.c,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM/src/k097/k2.c	1999/10/08 02:12:15	1.1
+++ OpenXM/src/k097/k2.c	2020/10/07 23:53:25	1.7
@@ -1,12 +1,17 @@
+/* $OpenXM: OpenXM/src/k097/k2.c,v 1.6 2015/10/10 11:29:46 takayama Exp $ */
 /* k2.c main program of k. */
 
 #define DATE "1998,12/15"
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
 #include "extern2.h"
 
+#include "ki.h"
+
 char *getLOAD_K_PATH();  /* from d.h */
 
 #ifdef CALLASIR
@@ -19,9 +24,9 @@ extern int DebugMode;
 extern int K00_verbose;
 
 int Startupk2 = 1;
-int FactorA = 0;  /* sm1(" (aa) run "); does not work. */
 
-main(int argc,char *argv[]) {
+
+void main(int argc,char *argv[]) {
   extern int Saki;
   extern int Interactive;
   int i;
@@ -33,9 +38,6 @@ main(int argc,char *argv[]) {
       if (strcmp(argv[i],"-d") == 0) {
 	fprintf(stderr,"DebugCompiler = 1\n");
 	DebugCompiler = 1;
-      }else if (strcmp(argv[i],"-f") == 0) {
-	fprintf(stderr,"Loading factor-a.sm1\n");
-	FactorA = 1;
       }else if (strcmp(argv[i],"-nostartup") == 0) {
 	fprintf(stderr,"Do not load startup.k\n");
 	Startupk2 = 0;
@@ -46,15 +48,14 @@ main(int argc,char *argv[]) {
       }else{
 	fprintf(stderr,"Usage: 1: k\n");
 	fprintf(stderr,"       2: k -d  (DebugCompiler=1)\n");
-	fprintf(stderr,"       3: k -f  (load factor-a.sm1)\n");
-	fprintf(stderr,"       4: k -nostartup  (do not load startup.k)\n");
-	fprintf(stderr,"       5: k -v (verbose) or k -vv \n");
+	fprintf(stderr,"       3: k -nostartup  (do not load startup.k)\n");
+	fprintf(stderr,"       4: k -v (verbose) or k -vv \n");
 	exit(1);
       }
     }
   }
 #ifdef CALLASIR
-  GC_init();
+  GC_INIT(); /* GC_init(); */
   KasirKanAsirInit();
 #endif
   KSstart();   /********  initialize ***********/
@@ -63,6 +64,7 @@ main(int argc,char *argv[]) {
 
   fprintf(stderr,"This is kan/k0 Version %s",DATE);
   fprintf(stderr,"\n");
+  fprintf(stderr,"WARNING: This is an EXPERIMENTAL version\n");
   if (K00_verbose == 1) {
     KSexecuteString(" /K00_verbose 1 def ");
   }else if (K00_verbose == 2) {
@@ -73,9 +75,8 @@ main(int argc,char *argv[]) {
   execFile("var.sm1"); KSexecuteString(" strictMode ");
   execFile("incmac.sm1");
   execFile("slib.sm1");
-  if (FactorA) execFile("factor-b.sm1");
 
-  printf("\n\nIn(1)=");
+  printf("\n\nIn(1)= ");
   s = "startup.k";
   if (Startupk2) {
     strcpy(tname,s);