fixing new numerics

Author: chatscriptnlp

BINARIES/ChatScriptmongo.exe

@@ -1,6 +1,6 @@
 #include "common.h" 
 #include "evserver.h"
-char* version = "7.41";
+char* version = "7.411";
 char sourceInput[200];
 FILE* userInitFile;
 int externalTagger = 0;

BINARIES/LinuxChatScript64

@@ -381,28 +381,39 @@ void StdNumber(char* word,char*& buffer,int controls) // text numbers may have s
         return;
     }
 
-	if (IsFloat(word,word+len))
+	// capture any percentage symbol
+	char* end = word + len;
+	bool percent = false;
+	if (*(end - 1) == '%')
+	{
+		*--end = 0;
+		percent = true;
+	}
+
+	int useNumberStyle = numberStyle;
+	if (controls & OUTPUT_NOCOMMANUMBER) useNumberStyle = NOSTYLE_NUMBERS;
+
+	if (IsFloat(word,end))
 	{
 		if (!fullfloat) // insure is not full
 		{
 			char c = word[len];
 			word[len] = 0;
-			WriteFloat(buffer, atof(word));
+			WriteFloat(buffer, atof(word), useNumberStyle);
 			word[len] = c;
 		}
-		else strcpy(buffer, word); // is best we can get
-		return;
+		else // write out what we have, don't redo the formatting
+		{
+			FormatFloat(word, buffer, useNumberStyle);
+		}
 	}
-
-    if (controls & OUTPUT_NOCOMMANUMBER) // no comma with <= 4 digit, e.g., year numbers
-    {
-        strcpy(buffer,word);  
-        return;
-    }
-
-	// add commas between number triples
-	// except india uses doubles until final triple
-	WriteInteger(word, buffer);
+	else
+	{
+		// add commas between number triples, unless not needed
+		// except india uses doubles until final triple
+		WriteInteger(word, buffer, useNumberStyle);
+	}
+	if (percent) strcat(buffer, "%");
 }
 
 char* StdIntOutput(int n)

BINARIES/chatscript.exe

@@ -309,6 +309,7 @@ bool Match(char* buffer,char* ptr, unsigned int depth, int startposition, char*
 	unsigned int startNest = functionNest;
 	int wildcardBase = wildcardIndex;
 	unsigned int result;
+	int bidirectional = 0;
     WORDP D;
 	unsigned int oldtrace = trace;
 	int beginmatch = -1; // for ( ) where did we actually start matching

BINARIES/chatscriptpg.exe

@@ -1205,8 +1205,13 @@ bool IsPlaceNumber(char* word) // place number and fraction numbers
 	return IsNumber(num,false) ? true : false; // show it is correctly a number - pass false to avoid recursion from IsNumber
 }
 
-void WriteInteger(char* word, char* buffer)
+void WriteInteger(char* word, char* buffer, int useNumberStyle)
 {
+	if (useNumberStyle == NOSTYLE_NUMBERS)
+	{
+		strcpy(buffer, word);
+		return;
+	}
 	char reverseFill[MAX_WORD_SIZE];
 	char* end = word + strlen(word);
 	char* at = reverseFill + 500;
@@ -1216,17 +1221,31 @@ void WriteInteger(char* word, char* buffer)
 	while (end != word)
 	{
 		*--at = *--end;
-		if (IsDigit(*at) && ++counter == limit)
+		if (IsDigit(*at) && ++counter == limit && end != word)
 		{
-			*--at = (numberStyle == FRENCH_NUMBERS) ? '.' : ',';
+			*--at = (useNumberStyle == FRENCH_NUMBERS) ? '.' : ',';
 			counter = 0;
-			limit = (numberStyle == INDIAN_NUMBERS) ? 2 : 3;
+			limit = (useNumberStyle == INDIAN_NUMBERS) ? 2 : 3;
 		}
 	}
 	strcpy(buffer, at);
 }
 
-char* WriteFloat(char* buffer, double value)
+void FormatFloat(char* word, char* buffer, int useNumberStyle)
+{
+	char* dot = strchr(word, '.');
+	if (dot) *dot = 0;
+	WriteInteger(word, buffer, useNumberStyle); // leading float/int bit
+
+	// Localise the decimal point
+	if (dot)
+	{
+		*dot = (useNumberStyle == FRENCH_NUMBERS) ? ',' : '.';
+		strcat(buffer, dot);
+	}
+}
+
+char* WriteFloat(char* buffer, double value, int useNumberStyle)
 {
 	char floatpart[MAX_WORD_SIZE];
 	if (!fullfloat) 
@@ -1245,14 +1264,7 @@ char* WriteFloat(char* buffer, double value)
 	}
 	else sprintf(floatpart, (char*)"%1.50g", value);
 
-	char* dot = strchr(floatpart, '.');
-	if (dot) *dot = 0; 
-	char head[MAX_WORD_SIZE];
-	WriteInteger(floatpart, head); // leading float/int bit
-
-	strcpy(buffer, head);
-	if (dot && numberStyle == FRENCH_NUMBERS) *dot = ',';
-	if (dot) strcat(buffer, dot);
+	FormatFloat(floatpart, buffer, useNumberStyle);
 	return buffer;
 }
 

SRC/mainSystem.cpp

@@ -41,6 +41,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #define VALIDLOWER 4
 #define VALIDUTF8 6
 
+#define NOSTYLE_NUMBERS -1
 #define AMERICAN_NUMBERS 0
 #define INDIAN_NUMBERS 1
 #define FRENCH_NUMBERS 2
@@ -140,7 +141,7 @@ bool IsModelNumber(char* word);
 bool IsInteger(char* ptr, bool comma);
 char* IsUTF8(char* buffer,char* character);
 char* Purify(char* msg);
-void WriteInteger(char* word, char* buffer);
+void WriteInteger(char* word, char* buffer, int useNumberStyle = NOSTYLE_NUMBERS);
 void BOMAccess(int &BOMvalue, char &oldc, int &oldCurrentLine);
 size_t OutputLimit(unsigned char* data);
 extern int startSentence;
@@ -161,7 +162,7 @@ char GetTemperatureLetter (char* ptr);
 bool IsLegalName(char* name);
 unsigned char* GetCurrency(unsigned char* ptr,char* &number);
 bool IsRomanNumeral(char* word, uint64& val);
-char* WriteFloat(char* buffer, double value);
+char* WriteFloat(char* buffer, double value, int useNumberStyle = NOSTYLE_NUMBERS);
 
 // conversion reoutines
 void MakeLowerCase(char* ptr);
@@ -176,6 +177,7 @@ char* TrimSpaces(char* msg,bool start = true);
 char* UTF2ExtendedAscii(char* bufferfrom);
 void RemoveImpure(char* buffer);
 void ChangeSpecial(char* buffer);
+void FormatFloat(char* word, char* buffer, int useNumberStyle = NOSTYLE_NUMBERS);
 
 // startup
 void InitTextUtilities();

SRC/outputSystem.cpp

@@ -453,7 +453,8 @@ void SetUserVariable(const char* var, char* word, bool assignment)
 	// cs_numbers changes are noticed by the engine (india, french, other)
 	else if (!stricmp(var, (char*)"$cs_numbers"))
 	{
-		if (!stricmp(word, "indian")) numberStyle = INDIAN_NUMBERS;
+		if (!word) numberStyle = AMERICAN_NUMBERS;
+		else if (!stricmp(word, "indian")) numberStyle = INDIAN_NUMBERS;
 		else if (!stricmp(word, "french")) numberStyle = FRENCH_NUMBERS;
 		else numberStyle = AMERICAN_NUMBERS;
 	}