CS 7.01 fix to topic $_ vars

Author: chatscriptnlp

BINARIES/LinuxChatScript64

@@ -1311,7 +1311,7 @@ concept: ~mythical_creatures   PROBABLE_NOUN (abominable_snowman Achilles Aegist
           Grim_Reaper gryphon halcyon Halcyon Harpy harpy Hector Helen Helen_of_Troy hellhound Heracles Herakles Hercules Hero hero hippogriff hobbit hobgoblin houri Humpty_Dumpty Hydra 
           hydra Hyperborean hypothetical_creature Icarus imaginary_creature~1 Iphigenia Jack_Frost jackalope Jason Jocasta Jotun Jotunn King_Oedipus Kraken kraken Kriss_Kringle Laertes 
           Laius Laocoon Leander Leda legendary_creature Leviathan leviathan Lich Lizard_Man Loch_Ness_monster Loch_Nness_monster loup-garou lycanthrope Mammon mandrake mantichora manticora 
-          manticore mantiger Martian Maxwell_'s_demon Medea medusa Medusa Menelaus mermaid merman Midas Mimir Minotaur monster Myrmidon mythical_being mythical_creature mythical_creature~1 
+          manticore mantiger Martian Maxwell_'s_demon Medea  Medusa Menelaus mermaid merman Midas Mimir Minotaur monster Myrmidon mythical_being mythical_creature mythical_creature~1 
           mythical_monster Narcissus Nemean_lion Nessie Nibelung Niobe Odysseus Oedipus Oedipus_Rex ogre ogress Orestes Orion Orpheus Pandora Paris Patroclus Pegasus Peleus Penelope 
           Perseus phoenix Priam Procrustes Psyche psychopomp Pygmalion pythoness Reaper Remus robot roc Romulus Saint_Nicholas Saint_Nick salamander sand_worm Santa Santa_Claus Sarpedon 
           Sasquatch Scylla sea_serpent shambler shoggoth Siegfried Sigurd Siren Sisyphus Sita snowman Sphinx St_._Nick Stentor Stheno sylph Tantalus Theseus Tiresias troll Ulysses unicorn 
@@ -2016,7 +2016,7 @@ concept: ~weapon_ammo (ammo ammunition arrow ball banderilla BB BB_shot bird_sho
           grapeshot musket_ball pellet projectile quarrel rifle_ball round_shot rubber_bullet shot slug spitball )
 concept: ~weapon_biological (aflatoxin anthrax_bacillus Bacillus_anthracis bioarm biological_weapon bioweapon botulin botulinus_toxin botulismotoxin clostridium_perfringens staphylococcal_enterotoxin_B )
 concept: ~weapon_future   (blaster disruptor freeze_ray laser_sword phaser ray_gun raygun shrink_ray )
-concept: ~weapon_magical   (Medusa_'s_head wand wizard_staff )
+concept: ~weapon_magical   ("Medusa's head" wand wizard_staff )
 concept: ~weapon_massdestruction (~weapon_biological ~weapon_nuclear W.M.D. weapon_of_mass_destruction~1 WMD )
 concept: ~weapon_medieval (arrow axe ballista battering_ram blade blowgun bludgeon bokken boomerang bow bow_and_arrow broadsword catapult club crossbow cudgel Cupid_'s_bow cupid_bow 
           dagger Excalibur flameberge flintlock grappling_hook halberd handbow harpoon javelin katana katar knife lance longbow longsword mace medieval_weapon medieval_weaponry morning_star 

BINARIES/chatscript.exe

@@ -1,7 +1,7 @@
 #ifndef _MAXH_
 #define _MAXH_
 #ifdef INFORMATION
-Copyright (C) 2011-2016 by Bruce Wilcox
+Copyright (C) 2011-2017 by Bruce Wilcox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
@@ -15,7 +15,6 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #endif
 
 #define DISCARDDICTIONARYBUILD 1  
-#define SEPARATE_STRING_SPACE 1
 
 // These can be used to shed components of the system to save space
 //#define DISCARDSERVER 1
@@ -32,7 +31,6 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #define DISCARDMYSQL 1
 
 #ifdef LOEBNER
-#undef SEPARATE_STRING_SPACE
 #define DISCARDSERVER 1
 #define DISCARDSCRIPTCOMPILER 1
 #define DISCARDTESTING 1
@@ -51,7 +49,6 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #define DISCARDPOSTGRES 1
 #define DISCARDMONGO 1
 //#undef  DISCARDDICTIONARYBUILD  // only a windows version can build a dictionary from scratch
-//#undef SEPARATE_STRING_SPACE
 //#define  TREETAGGER 1
 
 #elif IOS

BINARIES/chatscriptpg.exe

@@ -57,7 +57,9 @@ static void TestIf(char* ptr,FunctionResult& result,char* buffer)
 		char word1val[MAX_WORD_SIZE];
 		char word2val[MAX_WORD_SIZE];
 		ptr = ReadCompiledWord(ptr,buffer);	
+		realCode = ptr;
 		result = HandleRelation(word1,op,buffer,true,id,word1val,word2val);
+		realCode = 0;
 		ptr = ReadCompiledWord(ptr,op);	//   AND, OR, or ) 
 	}
 	else //   existence of non-failure or any content
@@ -215,7 +217,7 @@ char* HandleIf(char* ptr, char* buffer,FunctionResult& result)
 			TestIf(ptr+2,result,buffer); 
 			if (!(result & ENDCODES)) strcpy(buffer,"true");
 			else strcpy(buffer,"false");
-			ChangeDepth(-1,"^if");
+			ChangeDepth(-1,"^if",true);
 			*buffer = 0;
 		}
 		if (trace & TRACE_OUTPUT  && CheckTopicTrace()) 

RAWDATA/ONTOLOGY/concepts.top

@@ -1,7 +1,7 @@
 #ifndef _CONSTRUCTCODEH_
 #define _CONSTRUCTCODEH_
 #ifdef INFORMATION
-Copyright (C) 2011-2016 by Bruce Wilcox
+Copyright (C) 2011-2017 by Bruce Wilcox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

SRC/common.h

@@ -1,5 +1,5 @@
 #ifdef INFORMATION
-Copyright (C) 2011-2016 by Bruce Wilcox
+Copyright (C) 2011-2017 by Bruce Wilcox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

SRC/constructCode.cpp

@@ -614,9 +614,6 @@ void InitDictionary()
 
 	//   dictionary and meanings and strings share space, running from opposite ends of a common pool
 	size_t size = (size_t)(sizeof(WORDENTRY) * maxDictEntries);
-#ifndef SEPARATE_STRING_SPACE
-	size += maxHeapBytes;
-#endif
 	size /= sizeof(WORDENTRY);
 	size = (size * sizeof(WORDENTRY)) + sizeof(WORDENTRY);
 	size /= 64;
@@ -646,10 +643,6 @@ void InitDictionary()
 #endif
 	memset(dictionaryBase,0,size);
 	dictionaryFree =  dictionaryBase + maxHashBuckets + HASH_EXTRA ;		//   prededicate hash space within the dictionary itself
-#ifndef SEPARATE_STRING_SPACE 	
-	heapBase = heapFree = ((char*)dictionaryBase) + size;				//   the end of the allocated space
-	stackFree = ((char*)dictionaryBase) + size - maxHeapBytes;
-#else
 	size = maxHeapBytes / 64;
 	size = (size * 64) + 64; // 64 bit align both ends
 	heapEnd = ((char*) malloc(size));	// point to end
@@ -660,7 +653,6 @@ void InitDictionary()
 	}
 	heapFree = heapBase = heapEnd + size; // allocate backwards
 	stackFree = heapEnd;
-#endif
 	minStringAvailable = maxHeapBytes;
 	stackStart = stackFree;
 	//   The bucket list is threaded thru WORDP nodes, and consists of indexes, not addresses.

SRC/constructCode.h

@@ -2,7 +2,7 @@
 #define _DICTIONARYSYSTEM_H
 
 #ifdef INFORMATION
-Copyright (C) 2011-2016 by Bruce Wilcox
+Copyright (C) 2011-2017 by Bruce Wilcox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell