diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.y/Defmod LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.y/Defmod
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.y/Defmod      Sun Apr  2 20:18:42 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.y/Defmod  Thu May  4 10:35:56 2000
***************
*** 22,29 ****
  
  /* Revision History:
  JRC            Original Release
! TV    990418   Modification originally devised by Tom Hughes:
!                Allows Constants to be declared
  */
  
  %{ /*C declarations*/
--- 22,30 ----
  
  /* Revision History:
  JRC            Original Release
! TV    19990418    Modification originally devised by Tom Hughes:
!                   Allows Constants to be declared
! TV    20000503    |bool| replaced by |osbool|
  */
  
  %{ /*C declarations*/
***************
*** 36,41 ****
--- 37,43 ----
     #include <swis.h>
  
     /*From OSLib*/
+    #include "types.h"
     #include "fileswitch.h"
     #include "macros.h"
     #include "os.h"
***************
*** 66,72 ****
  
     lookup_t main_byte_wide;
  
!    static bool Verbose = FALSE, Parse_Error = FALSE;
  
     static int yylex (void);
  
--- 68,74 ----
  
     lookup_t main_byte_wide;
  
!    static osbool Verbose = FALSE, Parse_Error = FALSE;
  
     static int yylex (void);
  
***************
*** 96,102 ****
     int num;
     char id [def_ID_LIMIT + 1];
     int reg;
!    bool option;
     char description [def_DESCRIPTION_LIMIT + 1];
  
     /*definition-in-progress types*/
--- 98,104 ----
     int num;
     char id [def_ID_LIMIT + 1];
     int reg;
!    osbool option;
     char description [def_DESCRIPTION_LIMIT + 1];
  
     /*definition-in-progress types*/
***************
*** 558,571 ****
  STAR:                 '*'     ws {};
  PLING:                '!'     ws {};
  
! INT:   '.' i n t     ws {};
! SHORT: '.' s h o r t ws {};
! BYTE:  '.' b y t e   ws {};
! CHAR:  '.' c h a r   ws {};
! BITS:  '.' b i t s   ws {};
! BYTES: '.' b y t e s ws {};
! BOOL:  '.' b o o l   ws {};
! VOID:  '.' v o i d   ws {};
  
  STRING: '.' s t r i n g ws {};
  ASM:    '.' a s m       ws {};
--- 560,573 ----
  STAR:                 '*'     ws {};
  PLING:                '!'     ws {};
  
! INT:   '.' i n t        ws {};
! SHORT: '.' s h o r t    ws {};
! BYTE:  '.' b y t e      ws {};
! CHAR:  '.' c h a r      ws {};
! BITS:  '.' b i t s      ws {};
! BYTES: '.' b y t e s    ws {};
! BOOL:  '.' b o o l      ws {};
! VOID:  '.' v o i d      ws {};
  
  STRING: '.' s t r i n g ws {};
  ASM:    '.' a s m       ws {};
