Accept FreeBasic style TYPE definitions for BASIC classes

Author: totalspectrum

Changelog.txt

@@ -1,5 +1,6 @@
 Version 7.6.8
 - Add OFFSETOF to BASIC
+- Accept FreeBasic style TYPE definitions for BASIC classes
 
 Version 7.6.7
 - Add OFFSETOF implementation

Test/basexec04.bas

@@ -86,24 +86,24 @@ interface floatable
   implements function asFloat() as single
 end interface
 
-class wrapFloat
+type wrapFloat
   dim f as single
   function asFloat() as single
     return f
   end function
   sub set(a as single)
     f = a
   end sub
-end class
-class wrapInt
+end type
+type wrapInt
   dim f as integer
   sub set(a as integer)
     f = a
   end sub
   function asFloat() as single
     return f
   end function
-end class
+end type
 
 sub testit(x as floatable)
   print x.asFloat() mod 2.1

doc/basic.md

@@ -2070,6 +2070,10 @@ Closes a subroutine definition.
 
 Closes a `try`/`catch` error handling block.
 
+#### END TYPE
+
+Closes any kind of type definition (`class`, `type`, or `union`).
+
 #### END WHILE
 
 Marks the end of a `while` loop; this may be used in place of `wend`.
@@ -3642,6 +3646,13 @@ Creates an alias for a type. For example,
 ```
 creates a new type name `uptr` which is a pointer to a `ubyte`. You may use the new type name anywhere a type is required.
 
+The `type` keyword may also be used instead of `class` for defining a class. For example:
+```
+  type mypoint
+    dim as integer x, y
+  end type
+```
+
 ### UBYTE
 
 An unsigned 8 bit integer, occupying one byte of computer memory. The signed version of this is `byte`. The difference arises with the treatment of the upper bit. Both `byte` and `ubyte` treat 0-127 the same, but for `byte` 128 to 255 are considered equivalent to -128 to -1 respectively (that is, when a `byte` is copied to a larger sized integer the upper bit is repeated into all the other bits; for `ubyte` the new bytes are filled with 0 instead).

frontends/basic/basic.y

@@ -2207,6 +2207,25 @@ classheader:
       current = P;
       $$ = NULL;
     }
+  | BAS_TYPE BAS_IDENTIFIER eoln
+    {
+      AST *ident = $2;
+      const char *classname = ident->d.string;
+      Module *P = NewModule(classname, current->curLanguage);
+      AST *newobj = NewAbstractObject( ident, NULL, 0 );
+      newobj->d.ptr = P;
+      AddSymbol(currentTypes, classname, SYM_TYPEDEF, newobj, NULL);
+      if (P != current) {
+          P->Lptr = current->Lptr;
+          P->subclasses = current->subclasses;
+          current->subclasses = P;
+          P->superclass = current;
+          P->fullname = current->fullname; // for finding "class using"
+      }
+      PushCurrentModule();
+      current = P;
+      $$ = NULL;
+    }
   | BAS_UNION BAS_IDENTIFIER eoln
     {
       AST *ident = $2;
@@ -2279,6 +2298,10 @@ classend:
           PopCurrentModule();
       }
     }  
+  | BAS_END BAS_TYPE
+    {
+      PopCurrentModule();
+    }  
 ;
 
 classdeclitem: