french revisions and other things

Author: chatscriptnlp

BINARIES/chatscript.exe

@@ -10,7 +10,7 @@ extern char* callArgumentList[MAX_ARGUMENT_COUNT+1];    //   function callArgume
 extern unsigned int callArgumentBase;
 
 #define ARGUMENT(n) callArgumentList[callArgumentBase+n]
-char* ReadCompiledWord(char* ptr, char* word,bool noquote = false,bool var = false);
+char* ReadCompiledWord(char* ptr, char* word,bool noquote = false,bool var = false,bool nolimit = false);
 char* ReadCompiledWordOrCall(char* ptr, char* word,bool noquote = false,bool var = false);
 
 #define INPUT_BUFFER_SIZE   80000

SRC/common1.h

@@ -106,22 +106,22 @@ struct Client_t
     char* bot;
     char* message;
     char* user;
-    char* data;
+    char* data = NULL;
 
     Client_t(int fd, struct ev_loop *l_p) : fd(fd), l(l_p), requestValid(false)
     {
         strcpy(this->magic, "deadbeef");
         ev_io_init(&this->ev_r, client_read, this->fd, EV_READ);
         ev_io_init(&this->ev_w, client_write, this->fd, EV_WRITE);
-		this->data = NULL;
-       this->ev_r.data = this;
+        this->ev_r.data = this;
         this->ev_w.data = this;
         ev_io_start(this->l, &this->ev_r);
     }
 
-    ~Client_t()
+    ~Client_t() // if child dies, this destructor is not called
     {
-		if (this->data) free(this->data);
+		if (this->data) free(this->data); 
+		this->data = NULL;
         if (ev_is_active(&this->ev_r))  ev_io_stop(this->l, &this->ev_r);
         if (ev_is_active(&this->ev_w))  ev_io_stop(this->l, &this->ev_w);
         close(this->fd);
@@ -186,7 +186,8 @@ struct Client_t
             }
 
             Log(SERVERLOG, "evserver: send_data() could not send, errno: %s", strerror(errno));
-            return -1;
+			printf( "evserver: send_data() could not send, errno: %s", strerror(errno));
+			return -1;
         }
 
         if (r < (int)len) 
@@ -209,7 +210,8 @@ struct Client_t
         if (this->ip.length() == 0) 
 		{
             Log(SERVERLOG, "evserver: prepare_for_chat() could not get ip for client: %d\r\n", this->fd);
-            return -1;
+			printf("evserver: prepare_for_chat() could not get ip for client: %d\r\n", this->fd);
+			return -1;
         }
 
         return 1;
@@ -258,12 +260,14 @@ static int setnonblocking(int fd)
     int flags = fcntl(fd, F_GETFL, 0);
     if (flags == -1) {
         Log(SERVERLOG, "evserver: setnonblocking() fcntl(F_GETFL) failed, errno: %s\r\n", strerror(errno));
-        return -1;
+		printf( "evserver: setnonblocking() fcntl(F_GETFL) failed, errno: %s\r\n", strerror(errno));
+		return -1;
     }
     if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) 
 	{
         Log(SERVERLOG, "evserver: setnonblocking() fcntl(F_SETFL) failed, errno: %s\r\n", strerror(errno));
-        return -1;
+		printf( "evserver: setnonblocking() fcntl(F_SETFL) failed, errno: %s\r\n", strerror(errno));
+		return -1;
     }
     return 1;
 }
@@ -277,7 +281,8 @@ int fork_child(ev_child *child_watcher = 0)
     pid = fork();
     if (pid < 0) {
 		Log(SERVERLOG, "evserver: fork failed, errno %d\r\n", errno);
-        return -1;
+		printf( "evserver: fork failed, errno %d\r\n", errno);
+		return -1;
     }
 
     if (pid > 0) {
@@ -307,10 +312,21 @@ int fork_child(ev_child *child_watcher = 0)
 }
 
 static void evsrv_child_died(EV_P_ ev_child *w, int revents) {
-    Log(SERVERLOG, "evserver: evsrv_child_died [pid: %d]\r\n", w->pid);
-    int r = fork_child(w);
-    if (r < 0)  Log(SERVERLOG, "  evserver: could not re-spawn child after it died [pid: %d]\r\n", w->pid);
-    else if (r == 1)   Log(SERVERLOG, "  evserver child: re-spawned [pid: %d]\r\n", getpid());
+	Log(SERVERLOG, "evserver: evsrv_child_died [pid: %d]\r\n", w->pid);
+	printf("evserver: evsrv_child_died [pid: %d]\r\n", w->pid);
+
+	int r = fork_child(w);
+	if (r < 0)
+	{
+		Log(SERVERLOG, "  evserver: could not re-spawn child after it died [pid: %d]\r\n", w->pid);
+		printf("  evserver: could not re-spawn child after it died [pid: %d]\r\n", w->pid);
+	}
+
+	else if (r == 1)
+	{
+		Log(SERVERLOG, "  evserver child: re-spawned [pid: %d]\r\n", getpid());
+		printf("  evserver child: re-spawned [pid: %d]\r\n", getpid());
+	}
 }
 #endif
 
@@ -453,6 +469,7 @@ int evsrv_init(const string &interfaceKind, int port, char* arg) {
     ev_io_init(&ev_accept_r_g, evsrv_accept, srv_socket_g, EV_READ);
     ev_io_start(l_g, &ev_accept_r_g);
 	Log(SERVERLOG, "  evserver: running pid: %d\r\n",getpid());
+	printf( "  evserver: running pid: %d\r\n", getpid());
 
     return 1;
 }
@@ -541,6 +558,12 @@ static void client_read(EV_P_ ev_io *w, int revents)
     }
 
     r = client->send_data();
+	if (client->data)
+	{
+		free(client->data);
+		client->data = NULL;
+	}
+
     if (r < 0) {
         Log(SERVERLOG, "evserver: could not sent data to client: %d\r\n", client->fd);
         delete client;
@@ -586,7 +609,8 @@ int evsrv_do_chat(Client_t *client)
 	}
 #endif
 	if (!client->data) 	client->data = (char*) malloc(outputsize);
- 
+	if (!client->data) printf("Malloc failed for child data\r\n");
+
 RESTART_RETRY:
 	strcpy(ourMainInputBuffer,client->message);
 	struct tm ptm;

SRC/evserver.cpp

@@ -227,6 +227,7 @@ bool GetSetMod(char* x)
 
 char* GetSetType(char* x)
 { // @13subject returns subject
+	if (!x[0] || !x[1] ) return ""; // safety from bad data
 	x += 2;
 	if (IsDigit(*x)) ++x;
 	return x;
@@ -1364,7 +1365,7 @@ char* ReadField(char* ptr,char* &field,char fieldkind, unsigned int& flags)
 		CopyRemoveEscapes(field,start,90000);	// we only remove ones we added
 		return end+2; // point AFTER the space after the closer
 	}
-    else  ptr = ReadCompiledWord(ptr,field); // no escaping or anything weird needed
+    else  ptr = ReadCompiledWord(ptr,field,false,false,true); // no escaping or anything weird needed
 	if (field[0] == '~') MakeLowerCase(field);	// all concepts/topics are lower case
 	return ptr; //   return at new token
 }

SRC/factSystem.cpp

@@ -594,8 +594,7 @@ char* InvokeUser(char* &buffer,char* ptr, FunctionResult& result,WORDP D,unsigne
 				if (id >= 0) val = AllocateStack(wildcardOriginalText[id],0,true);
 				else val = AllocateStack("");
 			}
-			if (*val && *(val-2) != '`' && *(val-1) != '`') 
-				val = AllocateStack(val,0,true);
+			else if (*val && *(val-1) != '`') val = AllocateStack(val,0,true);
 			arg->w.userValue = val;
 		}
 	}
@@ -3850,11 +3849,9 @@ FunctionResult MatchCode(char* buffer)
 		ReadShortCommandArg(word1,word,result,OUTPUT_NOQUOTES); 
 		if (result != NOPROBLEM_BIT) return result;
 	}
-	else 
-	{
-		if (word1[0] == FUNCTIONSTRING && word1[1] == '(') strcpy(word,word1+1);
-		else strcpy(word,word1); // otherwise it is what to say (like from idiom table)
-	}
+	else if (word1[0] == FUNCTIONSTRING && word1[1] == '(') strcpy(word,word1+1);
+	else strcpy(word, ARGUMENT(1)); // otherwise it is what to say (like from idiom table)
+	
 	WORDP X = FindWord(word);
 	if (*word == '~' && (!X || !(X->internalBits & (CONCEPT|TOPIC))) && strchr(word,'.')) // named an existing rule 
 	{
@@ -5906,14 +5903,15 @@ static FunctionResult AddPropertyCode(char* buffer)
 	WORDP D = NULL;
 	int store = 0;
 	unsigned int count = 0;
+	char arg3 = 0;
 	if (*arg1 == '@') // add property to all facts in set either on a field or fact as a whole
 	{
 		store = GetSetID(arg1);
 		if (store == ILLEGAL_FACTSET) return FAILRULE_BIT;
 		count =  FACTSET_COUNT(store);
+		arg3 = *GetSetType(arg1);
 	}
 	else  D = StoreWord(arg1,0); // add property to dictionary word
-	char arg3 = *GetSetType(arg1);
 
 	uint64 val = 0;
 	uint64 sysval = 0;

SRC/functionExecute.cpp

@@ -237,14 +237,15 @@ int factsJsonHelper(char *jsontext, jsmntok_t *tokens, int tokenlimit, int sizel
 	}
 	case JSMN_STRING: {
 		char* limit;
-		char* str = InfiniteStack(limit,"factsJsonHelper");
+		char* str = InfiniteStack(limit,"factsJsonHelper string");
 		strncpy(str,jsontext + curr.start,size);
 		str[size] = 0;
 		*flags = JSON_STRING_VALUE; // string null
-		ReleaseInfiniteStack();
+		CompleteBindStack();
 		if (!PreallocateHeap(size)) return FAILRULE_BIT;
 		if (size == 0)  *retMeaning = MakeMeaning(StoreWord((char*)"null",AS_IS));
 		else  *retMeaning = MakeMeaning(StoreWord(str,AS_IS));
+		ReleaseStack(str);
 		break;
 	}
 	case JSMN_OBJECT: {
@@ -984,7 +985,7 @@ static char* jwritehierarchy(int depth, char* buffer, WORDP D, int subject, int
 		size = (buffer - currentOutputBase + 400); // 400 slop to protect us
 		if (size >= currentOutputLimit) 
 		{
-			ReportBug((char*)"Json too much");
+			ReportBug((char*)"Json too much %d items size %d", indexsize,size);
 			ReleaseStack((char*)stack);
 			return buffer; // too much output
 		}

SRC/json.cpp

@@ -1088,7 +1088,11 @@ void ProcessInputFile()
 			extraTopicData = NULL;
 		}
 		else turn = PerformChat(loginID, computerID, ourMainInputBuffer, NULL, ourMainOutputBuffer); // no ip
-		if (turn == PENDING_RESTART) Restart();
+		if (turn == PENDING_RESTART)
+		{
+			ourMainInputBuffer[0] = ourMainInputBuffer[1] = 0;
+			Restart();
+		}
 	}
 	if (sourceFile != stdin) 
 	{

SRC/mainSystem.cpp

@@ -606,9 +606,10 @@ static char* Output_Backslash(char* word, char* ptr, char* space,char*& buffer,
 static char* ResetOutputPtr(char* start,char* buffer)
 {
 	char* at = strrchr(start,'`');	// where it ended
+	if (!at) return start;
 	size_t len = strlen(at+1); 
 	memmove(start,at+1,len+1);	// shift new data back to start
-	if (start[len-1] == ' ') --len;	// output ended with a space, remove it
+	if (currentOutputBase != start && start[len-1] == ' ') --len;	// output ended with a space, remove it
 	start[len] = 0;
 	return start + len; // resume back at original buffer location
 }

SRC/outputSystem.cpp

@@ -385,6 +385,10 @@ char* ReadSystemToken(char* ptr, char* word, bool separateUnderscore) //   how w
 {
 	*word = 0;
     if (!ptr)  return 0;
+	if (ptr[0] == '<' && ptr[1] == '<' && ptr[2] == '"')
+	{
+		int xx = 0;
+	}
 	char tmp[MAX_WORD_SIZE];
     char* start = word;
     ptr = SkipWhitespace(ptr);
@@ -668,6 +672,11 @@ char* ReadSystemToken(char* ptr, char* word, bool separateUnderscore) //   how w
     word = start;
 	size_t len = strlen(word);
 	if (len == 0) return ptr; 
+	if (patternContext && word[len - 1] == '"' && word[len - 2] != '\\')
+	{
+		char* quote = strchr(word, '"');
+		if (quote == word+len-1) BADSCRIPT("Tailing quote without start: %s", word)
+	}
 	if (*word == '#' && !strstr(readBuffer,"rename:")) // is this a constant from dictionary.h? or user constant
 	{
 		uint64 n;

SRC/scriptCompile.cpp

@@ -616,8 +616,8 @@ bool SpellCheckSentence()
 			// dont spell check proper names to improper, if word before or after is lower case originally
 			if (word && i != 1 && originalCapState[i] && !IsUpperCase(*word))
 			{
-				if (!originalCapState[i-1]) return false;
-				else if (i != wordCount && !originalCapState[i+1]) return false;
+				if (!originalCapState[i-1]) continue;
+				else if (i != wordCount && !originalCapState[i+1]) continue;
 			}
 
 			if (word && !*word) // performed substitution on prior word, restart this one