Make #print typeof() differentiate between Zstring and Zstring * 1

This should make it more accurate.
	dim pz as zstring ptr
	#print typeof(*pz)
gave "ZSTRING * 1" previously, which may be a bit confusing, considering
that a ZSTRING PTR doesn't have a length encoded in the type. It's not like
a ZSTRING * N variable... now this would just print "ZSTRING".

Author: dkl

changelog.txt

@@ -12,6 +12,7 @@ Version 1.05.0
 - 1.04.0 regression: Under -gen gcc -asm att, support for gcc-style inline asm was broken
 - ld was warning about unsupported linker options on OS X
 - BYREF fixed-length strings (e.g. BYREF myParameter AS ZSTRING * 10) now trigger a compiler error since they are unsupported
+- #print typeof() output now differentiates between ZSTRING and ZSTRING * N (ZSTRING without size is produced by dereferencing a ZSTRING PTR, or BYREF AS ZSTRING)
 
 
 Version 1.04.0

src/compiler/ast-misc.bas

@@ -1214,14 +1214,16 @@ sub astSetType _
 
 end sub
 
-function astSizeOf( byval n as ASTNODE ptr ) as longint
+function astSizeOf( byval n as ASTNODE ptr, byref is_fixlenstr as integer ) as longint
+	is_fixlenstr = FALSE
 	function = symbCalcLen( n->dtype, n->subtype )
 
 	'' If it's a STRING * N, we must get the real length from the
 	'' associated symbol, since the N isn't encoded in the dtype/subtype.
 	select case( typeGetDtAndPtrOnly( n->dtype ) )
 	case FB_DATATYPE_CHAR, FB_DATATYPE_WCHAR, FB_DATATYPE_FIXSTR
 		if( n->sym ) then
+			is_fixlenstr = TRUE
 			function = symbGetLen( n->sym )
 		end if
 	end select

src/compiler/ast.bi

@@ -1295,7 +1295,7 @@ declare sub astSetType _
 		byval subtype as FBSYMBOL ptr _
 	)
 
-declare function astSizeOf( byval n as ASTNODE ptr ) as longint
+declare function astSizeOf( byval n as ASTNODE ptr, byref is_fixlenstr as integer = FALSE ) as longint
 declare function astIsAccessToLocal( byval expr as ASTNODE ptr ) as integer
 declare function astIsRelationalBop( byval n as ASTNODE ptr ) as integer
 

src/compiler/parser-decl-const.bas

@@ -12,7 +12,7 @@ private sub hGetType( byref dtype as integer, byref subtype as FBSYMBOL ptr )
 	if( lexGetToken( ) = FB_TK_AS ) then
 		lexSkipToken( )
 
-		if( cSymbolType( dtype, subtype, 0 ) = FALSE ) then
+		if( cSymbolType( dtype, subtype ) = FALSE ) then
 			errReport( FB_ERRMSG_EXPECTEDIDENTIFIER )
 			dtype = FB_DATATYPE_INTEGER
 			subtype = NULL

src/compiler/parser-decl-proc-params.bas

@@ -396,7 +396,7 @@ private function hParamDecl _
 			options or= FB_SYMBTYPEOPT_ISBYREF
 		end if
 
-		if( cSymbolType( dtype, subtype, 0, options ) = FALSE ) then
+		if( cSymbolType( dtype, subtype, , , options ) = FALSE ) then
 			hParamError( proc, id )
 			'' error recovery: fake type
 			dtype = FB_DATATYPE_INTEGER

src/compiler/parser-decl-symbtype.bas

@@ -149,7 +149,8 @@ function cTypeOrExpression _
 		byval tk as integer, _
 		byref dtype as integer, _
 		byref subtype as FBSYMBOL ptr, _
-		byref lgt as longint _
+		byref lgt as longint, _
+		byref is_fixlenstr as integer _
 	) as ASTNODE ptr
 
 	dim as ASTNODE ptr expr = any
@@ -211,7 +212,7 @@ function cTypeOrExpression _
 
 	if( maybe_type ) then
 		'' Parse as type
-		if( cSymbolType( dtype, subtype, lgt, FB_SYMBTYPEOPT_NONE ) ) then
+		if( cSymbolType( dtype, subtype, lgt, is_fixlenstr, FB_SYMBTYPEOPT_NONE ) ) then
 			'' Successful -- it's a type, not an expression
 			ambigioussizeof.maybeWarn( tk, TRUE )
 			return NULL
@@ -235,13 +236,14 @@ sub cTypeOf _
 	( _
 		byref dtype as integer, _
 		byref subtype as FBSYMBOL ptr, _
-		byref lgt as longint _
+		byref lgt as longint, _
+		byref is_fixlenstr as integer _
 	)
 
 	dim as ASTNODE ptr expr = any
 
 	'' Type or an Expression
-	expr = cTypeOrExpression( FB_TK_TYPEOF, dtype, subtype, lgt )
+	expr = cTypeOrExpression( FB_TK_TYPEOF, dtype, subtype, lgt, is_fixlenstr )
 
 	'' Was it a type?
 	if( expr = NULL ) then
@@ -252,7 +254,7 @@ sub cTypeOf _
 
 	dtype   = astGetFullType( expr )
 	subtype = astGetSubtype( expr )
-	lgt     = astSizeOf( expr )
+	lgt     = astSizeOf( expr, is_fixlenstr )
 
 	astDelTree( expr )
 end sub
@@ -306,16 +308,18 @@ function cSymbolType _
 		byref dtype as integer, _
 		byref subtype as FBSYMBOL ptr, _
 		byref lgt as longint, _
+		byref is_fixlenstr as integer, _
 		byval options as FB_SYMBTYPEOPT _
 	) as integer
 
 	dim as integer isunsigned = any, isfunction = any
 
 	function = FALSE
 
-	lgt = 0
 	dtype = FB_DATATYPE_INVALID
 	subtype = NULL
+	lgt = 0
+	is_fixlenstr = FALSE
 
 	dim as integer is_const = FALSE
 	dim as integer ptr_cnt = 0
@@ -332,7 +336,7 @@ function cSymbolType _
 		end if
 
 		'' datatype
-		cTypeOf( dtype, subtype, lgt )
+		cTypeOf( dtype, subtype, lgt, is_fixlenstr )
 
 		'' ')'
 		if( hMatch( CHAR_RPRNT ) = FALSE ) then
@@ -520,6 +524,7 @@ function cSymbolType _
 							dtype = symbGetFullType( sym )
 							subtype = symbGetSubtype( sym )
 							lgt = symbGetLen( sym )
+							is_fixlenstr = symbGetIsFixLenStr( sym )
 							ptr_cnt += typeGetPtrCnt( dtype )
 							exit do, do
 						end select
@@ -576,6 +581,7 @@ function cSymbolType _
 
 		'' expr
 		lgt = cConstIntExpr( cEqInParensOnlyExpr( ) )
+		is_fixlenstr = TRUE
 
 		select case as const typeGet( dtype )
 		case FB_DATATYPE_STRING

src/compiler/parser-decl-typedef.bas

@@ -54,12 +54,13 @@ private function hReadType _
 	( _
 		byref dtype as integer, _
 		byref subtype as FBSYMBOL ptr, _
-		byref lgt as longint _
+		byref lgt as longint, _
+		byref is_fixlenstr as integer _
 	) as zstring ptr
 
     static as zstring * FB_MAXNAMELEN+1 tname
 
-	if( cSymbolType( dtype, subtype, lgt, FB_SYMBTYPEOPT_ALLOWFORWARD ) ) then
+	if( cSymbolType( dtype, subtype, lgt, is_fixlenstr, FB_SYMBTYPEOPT_ALLOWFORWARD ) ) then
 		return NULL
 	end if
 
@@ -95,7 +96,8 @@ private sub hAddForwardRef _
 		byval pfwdname as zstring ptr, _
 		byref dtype as integer, _
 		byref subtype as FBSYMBOL ptr, _
-		byref lgt as longint _
+		byref lgt as longint, _
+		byref is_fixlenstr as integer _
 	)
 
     dim as integer ptrcount = typeGetPtrCnt( dtype )
@@ -115,6 +117,7 @@ private sub hAddForwardRef _
 
         subtype = NULL
         lgt = 0
+        is_fixlenstr = FALSE
     else
 
         '' The typeJoin()'s will remove the PTR's off the typedef's type, but we
@@ -167,16 +170,21 @@ private sub hAddTypedef _
 		byval pfwdname as zstring ptr, _
 		byval dtype as integer, _
 		byval subtype as FBSYMBOL ptr, _
-		byval lgt as longint _
+		byval lgt as longint, _
+		byval is_fixlenstr as integer _
 	)
 
     '' Forward ref? Note: may update dtype & co
     if( pfwdname <> NULL ) then
-		hAddForwardRef( pid, pfwdname, dtype, subtype, lgt )
+		hAddForwardRef( pid, pfwdname, dtype, subtype, lgt, is_fixlenstr )
     end if
 
     dim as FBSYMBOL ptr typedef = symbAddTypedef( pid, dtype, subtype, lgt )
-    if( typedef = NULL ) then
+    if( typedef ) then
+        if( is_fixlenstr ) then
+            symbSetIsFixLenStr( typedef )
+        end if
+    else
         '' check if the dup definition is different
         dim as integer isdup = TRUE
         dim as FBSYMBOL ptr sym = any
@@ -235,35 +243,28 @@ end function
 
 '' MultipleTypedef  =  TYPE AS SymbolType symbol (',' symbol)*
 sub cTypedefMultDecl( )
-    dim as zstring ptr pfwdname = any, pid = any
-	dim as integer dtype = any
-	dim as longint lgt = any
-    dim as FBSYMBOL ptr subtype = any
-
 	if( cCompStmtIsAllowed( FB_CMPSTMT_MASK_DECL or FB_CMPSTMT_MASK_CODE ) = FALSE ) then
 		hSkipStmt( )
 		exit sub
 	end if
 
-    '' AS
-    lexSkipToken( )
+	'' AS
+	lexSkipToken( )
 
-    '' SymtolType
-    pfwdname = hReadType( dtype, subtype, lgt )
+	'' SymtolType
+	dim as integer dtype, is_fixlenstr
+	dim as longint lgt
+	dim as FBSYMBOL ptr subtype
+	var pfwdname = hReadType( dtype, subtype, lgt, is_fixlenstr )
 
-    do
-        '' Parse the ID
-        pid = hReadId( )
-
-        hAddTypedef( pid, pfwdname, dtype, subtype, lgt )
+	do
+		'' Parse the ID
+		var pid = hReadId( )
 
-    	'' ','?
-    	if( lexGetToken( ) <> CHAR_COMMA ) then
-    		exit do
-    	end if
+		hAddTypedef( pid, pfwdname, dtype, subtype, lgt, is_fixlenstr )
 
-    	lexSkipToken( )
-    loop
+		'' ','?
+	loop while( hMatch( CHAR_COMMA ) )
 end sub
 
 '' SingleTypedef  =  TYPE symbol AS SymbolType (',' symbol AS SymbolType)*
@@ -275,32 +276,26 @@ sub cTypedefSingleDecl( byval pid as zstring ptr )
 		exit sub
 	end if
 
-    dim as zstring ptr pfwdname = any
-	dim as integer dtype = any
-	dim as longint lgt = any
-    dim as FBSYMBOL ptr subtype = any
-
-    do
-        '' AS?
-        if( lexGetToken( ) <> FB_TK_AS ) then
-            errReport( FB_ERRMSG_SYNTAXERROR )
-        else
-            lexSkipToken( )
-        end if
-
-        '' SymtolType
-        pfwdname = hReadType( dtype, subtype, lgt )
+	do
+		'' AS?
+		if( hMatch( FB_TK_AS ) = FALSE ) then
+			errReport( FB_ERRMSG_SYNTAXERROR )
+		end if
 
-        hAddTypedef( pid, pfwdname, dtype, subtype, lgt )
+		'' SymtolType
+		dim as integer dtype, is_fixlenstr
+		dim as longint lgt
+		dim as FBSYMBOL ptr subtype
+		var pfwdname = hReadType( dtype, subtype, lgt, is_fixlenstr )
 
-    	'' ','?
-    	if( lexGetToken( ) <> CHAR_COMMA ) then
-    		exit do
-    	end if
+		hAddTypedef( pid, pfwdname, dtype, subtype, lgt, is_fixlenstr )
 
-    	lexSkipToken( )
+		'' ','?
+		if( hMatch( CHAR_COMMA ) = FALSE ) then
+			exit do
+		end if
 
-        '' Parse the next ID
-        pid = hReadId( )
-    loop
+		'' Parse the next ID
+		pid = hReadId( )
+	loop
 end sub

src/compiler/parser-decl-var.bas

@@ -48,7 +48,7 @@ sub hSymbolType _
 	end if
 
 	'' parse the symbol type (INTEGER, STRING, etc...)
-	if( cSymbolType( dtype, subtype, lgt, options ) = FALSE ) then
+	if( cSymbolType( dtype, subtype, lgt, , options ) = FALSE ) then
 		errReport( FB_ERRMSG_EXPECTEDIDENTIFIER )
 		'' error recovery: fake a type
 		dtype = FB_DATATYPE_INTEGER

src/compiler/parser-expr-binary.bas

@@ -376,7 +376,7 @@ function cIsExpression _
 	'' SymbolType
 	dim as integer dtype = any
 	dim as FBSYMBOL ptr subtype = any
-	if( cSymbolType( dtype, subtype, 0 ) = FALSE ) then
+	if( cSymbolType( dtype, subtype ) = FALSE ) then
 		return NULL
 	end if
 

src/compiler/parser-expr-unary.bas

@@ -300,7 +300,7 @@ private function hCast( byval options as AST_CONVOPT ) as ASTNODE ptr
 	lexSkipToken( )
 
 	'' DataType
-	if( cSymbolType( dtype, subtype, 0 ) = FALSE ) then
+	if( cSymbolType( dtype, subtype ) = FALSE ) then
 		errReport( FB_ERRMSG_SYNTAXERROR )
 		'' error recovery: skip until ',', create a fake type
 		hSkipUntil( CHAR_COMMA )