Allow [static] shared byref variables to be initialized with byref variable

Author: jayrm

changelog.txt

@@ -14,6 +14,7 @@ Version 1.06.0
 - Under X11, ScreenControl GET_WINDOW_HANDLE places the Display ptr in param2
 - Updated bindings: SDL2 2.0.6, SDL2_image 2.0.1, SDL2_mixer 2.0.1, SDL2_net 2.0.1, SDL2_ttf 2.0.14
 - allow overload operator SQR()
+- allow [static] shared byref variables to be initialized with byref variable
 
 [fixed]
 - win/d3dx9.bi no longer has a hard-coded #inclib "d3dx9d". d3dx9d.dll is apparently not a generally valid choice. In practice programs have to be linked against d3dx9_33.dll or d3dx9_39.dll, etc.

src/compiler/parser-decl-var.bas

@@ -866,7 +866,7 @@ private function hResolveRefToRefInitializer( byval dtype as integer, byval expr
 
 	if( expr andalso astIsDEREF( expr ) ) then
 		if( expr->l andalso astIsVAR( expr->l ) ) then
-			if( expr->l->sym andalso symbIsRef( expr->l->sym ) ) then
+			if( expr->l->sym andalso symbIsRef( expr->l->sym ) andalso symbIsVar( expr->l->sym ) ) then
 				tree = expr->l->sym->var_.initree
 				if( tree andalso astIsTYPEINI( tree ) ) then
 					if( tree->l andalso tree->l->class = AST_NODECLASS_TYPEINI_ASSIGN ) then

tests/dim/byref-init-from-byref.bas

@@ -115,7 +115,7 @@ dim    shared byref as T T73 = T72
 static shared byref as T T74 = T73
 
 
-'' UDT with static byref fields
+'' UDT2 with static byref fields
 
 type T1
 	dim as integer F
@@ -129,9 +129,9 @@ type T2
 	static byref as T1 R4
 end type
 
-dim shared T2_Initializer as T1
+dim shared T1_Initializer as T1
 
-dim byref as T1 T2.R1 = T2_Initializer
+dim byref as T1 T2.R1 = T1_Initializer
 dim byref as T1 T2.R2 = T2.R1
 dim byref as T1 T2.R3 = T2.R2
 dim byref as T1 T2.R4 = T2.R3
@@ -141,6 +141,11 @@ dim shared byref as T1 RT2 = T2.R2
 dim shared byref as T1 RT3 = T2.R3
 dim shared byref as T1 RT4 = T2.R4
 
+static shared byref as T1 SRT1 = RT1
+static shared byref as T1 SRT2 = RT2
+static shared byref as T1 SRT3 = RT3
+static shared byref as T1 SRT4 = RT4
+
 
 SUITE( fbc_tests.dim_.byref_init_from_byref )
 
@@ -274,10 +279,10 @@ SUITE( fbc_tests.dim_.byref_init_from_byref )
 	END_TEST
 
 	TEST( UDT_static_local_to_static_shared )
-		static byref as T b = T51
-		static byref as T c = T54
+		static byref as T b = T71
+		static byref as T c = T74
 		dim    byref as T d = c
-		CheckAddrs( T51, b, c, d )
+		CheckAddrs( T71, b, c, d )
 	END_TEST
 
 	'' -------- UDT2 -------------------
@@ -290,5 +295,47 @@ SUITE( fbc_tests.dim_.byref_init_from_byref )
 		CheckAddrs( RT1, RT2, RT3, RT4 )
 	END_TEST
 
-	
+	TEST( UDT2_static_to_shared )
+		CheckAddrs( SRT1, SRT2, SRT3, SRT4 )
+	END_TEST
+
+	TEST( UDT2_check_all )
+		static byref as T1 a = T2.R1
+		static byref as T1 b = RT1
+		dim    byref as T1 c = SRT1
+		dim    byref as T1 d = c
+		CheckAddrs( T2.R1, RT1, SRT1, a )
+		CheckAddrs( T2.R2, RT2, SRT2, b )
+		CheckAddrs( T2.R3, RT3, SRT3, c )
+		CheckAddrs( T2.R4, RT4, SRT4, d )
+	END_TEST
+
+	TEST( UDT2_local_to_shared )
+		static byref as T1 b = RT1
+		dim    byref as T1 c = RT4
+		dim    byref as T1 d = c
+		CheckAddrs( RT1, b, c, d )
+	END_TEST
+
+	TEST( UDT2_local_to_static_shared )
+		static byref as T1 b = SRT1
+		dim    byref as T1 c = SRT4
+		dim    byref as T1 d = c
+		CheckAddrs( SRT1, b, c, d )
+	END_TEST
+
+	TEST( UDT2_static_local_to_shared )
+		static byref as T1 b = RT1
+		static byref as T1 c = RT4
+		dim    byref as T1 d = c
+		CheckAddrs( RT1, b, c, d )
+	END_TEST
+
+	TEST( UDT2_static_local_to_static_shared )
+		static byref as T1 b = SRT1
+		static byref as T1 c = SRT4
+		dim    byref as T1 d = c
+		CheckAddrs( SRT1, b, c, d )
+	END_TEST
+
 END_SUITE