Update to patched version of Inform 6

ptomato · ptomato · commit c304f58e243c · 2014-09-02T06:11:20.000Z
This is not a 6.34 release, but contains two patches relative to the
version of 6.33 that was shipped with Inform 6L02.
diff --git a/src/inform6/ReleaseNotes.html b/src/inform6/ReleaseNotes.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <h1>Inform Release Notes</h1>
-<h3>Inform Compiler 6.33, 6.32, 6.31, 6.30<br>Inform Library 6/11</h3>
+<h3>Inform Compiler 6.34, 6.33, 6.32, 6.31, 6.30<br>Inform Library 6/11</h3>
 
 <h2>Introduction</h2>
 This is a maintenance release of the Inform system for creating adventure games, intended to address 
@@ -44,15 +44,26 @@ <h2>Acknowledgements</h2>
 There are, naturally, sure to be imperfections in the release, and these should be reported through the
 <a href="http://inform7.com/mantis/">Inform bug tracker</a>.
 
+<h2>Compiler 6.34</h2>
+These are the changes delivered in version 6.34 of the Inform compiler.
+<h3>Bugs fixed</h3>
+Items of the form [Mantis N] quote the bug&rsquo;s reference number in Inform 7&rsquo;s Mantis bug tracker. 
+<ul>
+<li><p>The output for the <tt>$list</tt> command line argument now includes the value of the
+<tt>$MAX_ARRAYS</tt> setting. [Mantis 1355]
+<li><p>Memory settings can no longer overflow if set to very large values. These values are limited to a
+maximum of 999999999: setting them higher just results in a warning. [Mantis 1356]
+</ul>
+
 <h2>Compiler 6.33</h2>
 These are the changes delivered in version 6.33 of the Inform compiler.
 <h3>Features added</h3>
 <ul>
 <li><p>Unused routines can now be detected and omitted from the compiled game, through two
-new settings. If <tt>$WARN_UNUSED_ROUTINES</tt> is set to 1, unused routines are reported during
-compilation. If <tt>$OMIT_UNUSED_ROUTINES</tt> is set to 1, unused routines (other than those in the
-Inform library) are omitted; if it is set to 2, unused routines anywhere, even in the library, are
-omitted.
+new settings. If <tt>$WARN_UNUSED_ROUTINES</tt> is set to 1, unused routines (other than those in
+the Inform library) are reported during compilation; if it is set to 2, unused routines anywhere,
+even in the library, are reported. If <tt>$OMIT_UNUSED_ROUTINES</tt> is set to 1, unused routines
+are omitted.
 <li><p>A new command line switch <tt><b>-Cu</b></tt> can be used to specify that the source file
 character set is UTF-8, allowing source files to contain Unicode characters beyond those defined in
 ISO 8859-1 to 8859-9.
@@ -105,7 +116,7 @@ <h3>Features added</h3>
 amount of additional space to add to each object record. The default is 0.
 </ul>
 <h3>Bugs fixed</h3>
-Items of the form [Mantis 510] quote the bug&rsquo;s reference number in Inform 7&rsquo;s Mantis bug tracker. 
+Items of the form [Mantis N] quote the bug&rsquo;s reference number in Inform 7&rsquo;s Mantis bug tracker. 
 <ul>
 <li><p>Function calls of the form <tt>f(g)(h)</tt> (that is, where <tt>f()</tt> returns the address of a
 function that is called with <tt>h</tt> as its argument) are now compiled correctly: previously, such calls were
@@ -145,12 +156,13 @@ <h3>Bugs fixed</h3>
   ];
 </pre>
 is now supported for Glulx. [Mantis 1214]
+<li><p>The statistics produced by the <tt>-s</tt> compiler switch are now correct for Glulx. [Mantis 1267]
 </ul>
 
 <h2>Compiler 6.32</h2>
 These are the changes delivered in version 6.32 of the Inform compiler.
 <h3>Features added</h3>
-Items of the form [C63104] quote the feature&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
+Items of the form [C63NNN] quote the feature&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
 Patch List. 
 <ul>
 <li><p>The Z-machine opcodes for pushing and pulling values from the stack are <tt>@push</tt> and <tt>@pull</tt>, used like this:
@@ -219,7 +231,7 @@ <h3>Features added</h3>
 However, this also requires library changes to be useful, as the library makes use of this dictionary table.
 </ul>
 <h3>Bugs fixed</h3>
-Items of the form [C63102] quote the bug&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
+Items of the form [C63NNN] quote the bug&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
 Patch List. 
 <ul>
 <li><p>Strict mode is no longer enabled by default when generating V3 and V4 Z-code files, as strict mode
@@ -248,7 +260,7 @@ <h3>Bugs fixed</h3>
 <h2>Compiler 6.31</h2>
 These are the changes delivered in version 6.31 of the Inform compiler.
 <h3>Bugs fixed</h3>
-Items of the form [C63016] quote the bug&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
+Items of the form [C63NNN] quote the bug&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
 Patch List. 
 <ul>
 <li><p>When individual properties are read (successfully), there is no longer a futile attempt to look up 
@@ -370,7 +382,7 @@ <h3>Features added</h3>
 typing <tt>name 'g' 'string'</tt> when you intended <tt>name 'g//' 'string'</tt>.
 </ul>
 <h3>Bugs fixed</h3>
-Items of the form [C62127] quote the bug&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
+Items of the form [C62NNN] quote the bug&rsquo;s reference number in the &lsquo;Compiler&rsquo; section of the Inform 
 Patch List. 
 <ul>
 <li><p>A problem with multiple assignment involving pointer arithmetic in Strict mode giving the wrong 
@@ -707,7 +719,7 @@ <h3>Library routines</h3>
 prints that string (with a terminating newline unless <tt><i>flag</i></tt> is 
 true).</blockquote>
 <h3>Bugs fixed</h3>
-Items of the form [L61036] quote the bug&rsquo;s reference number in the &lsquo;Library&rsquo; section of the Inform 
+Items of the form [L610NN] quote the bug&rsquo;s reference number in the &lsquo;Library&rsquo; section of the Inform 
 Patch List.
 <ul>
 <li><p>A command like EMPTY ME no longer replies &ldquo;yourself can't contain things&rdquo;. [L61036] 
diff --git a/src/inform6/header.h b/src/inform6/header.h
@@ -30,14 +30,14 @@
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
-#define RELEASE_DATE "18th April 2014"
+#define RELEASE_DATE "20th August 2014"
 #define RELEASE_NUMBER 1633
 #define GLULX_RELEASE_NUMBER 38
 #define MODULE_VERSION_NUMBER 1
 #define VNUMBER RELEASE_NUMBER
 
 /* N indicates an intermediate release for Inform 7 */
-/*#define RELEASE_SUFFIX "N"*/
+#define RELEASE_SUFFIX "N"
 
 /* ------------------------------------------------------------------------- */
 /*   Our host machine or OS for today is...                                  */
diff --git a/src/inform6/memory.c b/src/inform6/memory.c
@@ -290,6 +290,7 @@ static void list_memory_sizes(void)
     printf("|  %25s = %-7d |\n","MAX_ACTIONS",MAX_ACTIONS);
     printf("|  %25s = %-7d |\n","MAX_ADJECTIVES",MAX_ADJECTIVES);
     printf("|  %25s = %-7d |\n","ALLOC_CHUNK_SIZE",ALLOC_CHUNK_SIZE);
+    printf("|  %25s = %-7d |\n","MAX_ARRAYS",MAX_ARRAYS);
     printf("|  %25s = %-7d |\n","NUM_ATTR_BYTES",NUM_ATTR_BYTES);
     printf("|  %25s = %-7d |\n","MAX_CLASSES",MAX_CLASSES);
     printf("|  %25s = %-7d |\n","MAX_DICT_ENTRIES",MAX_DICT_ENTRIES);
@@ -861,6 +862,59 @@ static void explain_parameter(char *command)
     return;
 }
 
+/* Parse a decimal number as an int32. Return true if a valid number
+   was found; otherwise print a warning and return false.
+
+   Anything over nine digits is considered an overflow; we report a
+   warning but return +/- 999999999 (and true). This is not entirely
+   clever about leading zeroes ("0000000001" is treated as an
+   overflow) but this is better than trying to detect genuine
+   overflows in a long.
+
+   (Some Glulx settings might conceivably want to go up to $7FFFFFFF,
+   which is a ten-digit number, but we're not going to allow that
+   today.)
+
+   This used to rely on atoi(), and we retain the atoi() behavior of
+   ignoring garbage characters after a valid decimal number.
+ */
+static int parse_memory_setting(char *str, char *label, int32 *result)
+{
+    char *cx = str;
+    char *ex;
+    long val;
+
+    *result = 0;
+
+    while (*cx == ' ') cx++;
+
+    val = strtol(cx, &ex, 10);    
+
+    if (ex == cx) {
+        printf("Bad numerical setting in $ command \"%s=%s\"\n",
+            label, str);
+        return 0;
+    }
+
+    if (*cx == '-') {
+        if (ex > cx+10) {
+            val = -999999999;
+            printf("Numerical setting underflowed in $ command \"%s=%s\" (limiting to %ld)\n",
+                label, str, val);
+        }
+    }
+    else {
+        if (ex > cx+9) {
+            val = 999999999;
+            printf("Numerical setting overflowed in $ command \"%s=%s\" (limiting to %ld)\n",
+                label, str, val);
+        }
+    }
+
+    *result = (int32)val;
+    return 1;
+}
+
 extern void memory_command(char *command)
 {   int i, k, flag=0; int32 j;
 
@@ -876,10 +930,7 @@ extern void memory_command(char *command)
     for (i=0; command[i]!=0; i++)
     {   if (command[i]=='=')
         {   command[i]=0;
-            j=(int32) atoi(command+i+1);
-            if ((j==0) && (command[i+1]!='0'))
-            {   printf("Bad numerical setting in $ command \"%s=%s\"\n",
-                    command,command+i+1);
+            if (!parse_memory_setting(command+i+1, command, &j)) {
                 return;
             }
             if (strcmp(command,"BUFFER_LENGTH")==0)
diff --git a/src/inform6/tables.c b/src/inform6/tables.c
@@ -1633,25 +1633,25 @@ Out:   %s %s %d.%c%c%c%c%c%c (%ld%sK long):\n",
 
             printf("\
 %6d classes (maximum %3d)        %6d objects (maximum %3d)\n\
-%6d global vars (maximum 233)    %6d variable/array space (maximum %d)\n",
+%6d global vars (maximum %3d)    %6d variable/array space (maximum %d)\n",
                  no_classes, MAX_CLASSES,
-                 no_objects, ((version_number==3)?255:(MAX_OBJECTS-1)),
-                 no_globals,
+                 no_objects, MAX_OBJECTS,
+                 no_globals, MAX_GLOBAL_VARIABLES,
                  dynamic_array_area_size, MAX_STATIC_DATA);
 
             printf(
 "%6d verbs (maximum %3d)          %6d dictionary entries (maximum %d)\n\
 %6d grammar lines (version %d)    %6d grammar tokens (unlimited)\n\
 %6d actions (maximum %3d)        %6d attributes (maximum %2d)\n\
-%6d common props (maximum %2d)    %6d individual props (unlimited)\n",
+%6d common props (maximum %3d)   %6d individual props (unlimited)\n",
                  no_Inform_verbs, MAX_VERBS,
                  dict_entries, MAX_DICT_ENTRIES,
                  no_grammar_lines, grammar_version_number,
                  no_grammar_tokens,
                  no_actions, MAX_ACTIONS,
-                 no_attributes, ((version_number==3)?32:48),
-                 no_properties-2, ((version_number==3)?30:62),
-                 no_individual_properties - 64);
+                 no_attributes, NUM_ATTR_BYTES*8,
+                 no_properties, INDIV_PROP_START,
+                 no_individual_properties - INDIV_PROP_START);
 
             if (track_unused_routines)
             {
@@ -1667,7 +1667,7 @@ Out:   %s %s %d.%c%c%c%c%c%c (%ld%sK long):\n",
 "%6ld characters used in text      %6ld bytes compressed (rate %d.%3ld)\n\
 %6d abbreviations (maximum %d)   %6d routines (unlimited)\n\
 %6ld instructions of code         %6d sequence points\n\
-%6ld bytes readable memory used (maximum 65536)\n\
+%6ld bytes writable memory used   %6ld bytes read-only memory used\n\
 %6ld bytes used in machine    %10ld bytes free in machine\n",
                  (long int) total_chars_trans,
                  (long int) strings_length,
@@ -1676,7 +1676,8 @@ Out:   %s %s %d.%c%c%c%c%c%c (%ld%sK long):\n",
                  no_abbreviations, MAX_ABBREVS,
                  no_routines,
                  (long int) no_instructions, no_sequence_points,
-                 (long int) Write_Code_At,
+                 (long int) (Out_Size - Write_RAM_At),
+                 (long int) Write_RAM_At,
                  (long int) Out_Size,
                  (long int)
                       (((long int) (limit*1024L)) - ((long int) Out_Size)));
