Import v6.12.4 of the Inform 6 standard library

[informlib.git] / grammar.h

diff --git a/grammar.h b/grammar.h
index c7807c532f2d0a6a9013e33474d2d0380374c96c..4a47881a865f11c3eeccaea5c4d2fc445280ea05 100644 (file)
--- a/grammar.h
+++ b/grammar.h
@@ -1,7 +1,7 @@
 ! ==============================================================================
 !   GRAMMAR:  Grammar table entries for the standard verbs library.
 !
-!   Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
+!   Supplied for use with Inform 6 -- Release 6.12.4 -- Serial number 200718
 !
 !   This file is free software: you can redistribute it and/or modify
 !   it under the terms of the GNU Affero General Public License as
@@ -96,9 +96,13 @@ Verb meta 'version'
 
 #Ifndef NO_PLACES;
 Verb meta 'objects'
-    *                                           -> Objects;
+    *                                           -> Objects
+    * 'tall'                                    -> ObjectsTall
+    * 'wide'                                    -> ObjectsWide;
 Verb meta 'places'
-    *                                           -> Places;
+    *                                           -> Places
+    * 'tall'                                    -> PlacesTall
+    * 'wide'                                    -> PlacesWide;
 #Endif; ! NO_PLACES
 
 ! ------------------------------------------------------------------------------
@@ -118,7 +122,7 @@ Verb meta 'changes'
 
 Verb meta 'gonear'
     * anynumber                                 -> GoNear
-    * noun                                      -> Gonear;
+    * noun                                      -> GoNear;
 
 
 Verb meta 'goto'
@@ -143,12 +147,12 @@ Verb meta 'showdict' 'dict'
     * topic                                     -> ShowDict;
 
 Verb meta 'showobj'
-    *                                           -> Showobj
-    * anynumber                                 -> Showobj
-    * multi                                     -> Showobj;
+    *                                           -> ShowObj
+    * anynumber                                 -> ShowObj
+    * multi                                     -> ShowObj;
 
 Verb meta 'showverb'
-    * special                                   -> Showverb;
+    * special                                   -> ShowVerb;
 
 Verb meta 'timers' 'daemons'
     *                                           -> TimersOn
@@ -185,7 +189,7 @@ Verb meta 'glklist'
 !  And now the game verbs.
 ! ------------------------------------------------------------------------------
 
-[ ADirection; if (noun in compass) rtrue; rfalse; ];
+[ ADirection; if (noun in Compass) rtrue; rfalse; ];
 
 Verb 'answer' 'say' 'shout' 'speak'
     * topic 'to' creature                       -> Answer;
@@ -442,11 +446,11 @@ Verb 'swing'
     * 'on' noun                                 -> Swing;
 
 Verb 'switch'
-    * noun                                      -> Switchon
-    * noun 'on'                                 -> Switchon
-    * noun 'off'                                -> Switchoff
-    * 'on' noun                                 -> Switchon
-    * 'off' noun                                -> Switchoff;
+    * noun                                      -> SwitchOn
+    * noun 'on'                                 -> SwitchOn
+    * noun 'off'                                -> SwitchOff
+    * 'on' noun                                 -> SwitchOn
+    * 'off' noun                                -> SwitchOff;
 
 Verb 'take' 'carry' 'hold'
     * multi                                     -> Take
@@ -476,10 +480,10 @@ Verb 'transfer'
 
 Verb 'turn' 'rotate' 'screw' 'twist' 'unscrew'
     * noun                                      -> Turn
-    * noun 'on'                                 -> Switchon
-    * noun 'off'                                -> Switchoff
-    * 'on' noun                                 -> Switchon
-    * 'off' noun                                -> Switchoff;
+    * noun 'on'                                 -> SwitchOn
+    * noun 'off'                                -> SwitchOff
+    * 'on' noun                                 -> SwitchOn
+    * 'off' noun                                -> SwitchOff;
 
 Verb 'unlock'
     * noun 'with' held                          -> Unlock;
@@ -555,6 +559,8 @@ Stub PrintTaskName     1;
 Stub PrintVerb         1;
 Stub TimePasses        0;
 Stub UnknownVerb       1;
+Stub AfterSave         1;
+Stub AfterRestore      1;
 
 #Ifdef TARGET_GLULX;
 Stub HandleGlkEvent    2;