Struct

.github/workflows/main.yml

@@ -303,9 +303,7 @@
 					##{"compiler": "intel", "version": "2022.2"},  # ifx 2022.2 doesn't have `do while ()` :(
 
 					{"compiler": "intel-classic", "version": "2021.10"},
-					{"compiler": "intel-classic", "version": "2021.1"},
-
-					##{"compiler": "nvidia-hpc", "version": "23.11"}  # setup fails
+					#{"compiler": "intel-classic", "version": "2021.1"},  # complains about coarrays???
 				]
 			}
 		},
@@ -405,7 +403,7 @@
 					mv /opt/homebrew/bin /opt/homebrew/bin-BACKUP || true \n
 					mv /opt/homebrew/opt /opt/homebrew/opt-BACKUP || true \n
 					mv /opt/homebrew/Cellar /opt/homebrew/Cellar-BACKUP || true \n
-					ls /opt/homebrew/ \n
+					#ls /opt/homebrew/ \n
 
 					curl -LO \"https://github.com/JeffIrwin/syntran/releases/latest/download/syntran-macos.zip\" \n
 					unzip syntran-macos*.zip \n

Dockerfile.ubuntu

@@ -7,8 +7,8 @@ RUN apt-get update -y
 RUN apt-get install -y vim
 
 ## syntran crashes almost immediately with gfortran 13
-ARG GFORT_VERS="12"
-#ARG GFORT_VERS="13"
+#ARG GFORT_VERS="12"
+ARG GFORT_VERS="13"
 
 #RUN apt-get install -y gfortran
 RUN apt-get install -y gfortran-${GFORT_VERS}
@@ -33,15 +33,15 @@ RUN fpm --version
 
 RUN yes | fpm clean
 RUN fpm build --compiler gfortran-${GFORT_VERS}
-RUN fpm test test --compiler gfortran-${GFORT_VERS}
-#RUN fpm test long --compiler gfortran-${GFORT_VERS}
-
-#ARG PROFILE release
-ARG PROFILE debug
-
-#RUN fpm build --compiler gfortran-${GFORT_VERS} --profile "$PROFILE" --link-flag "-static-libgcc -static-libgfortran -static-libquadmath"
-
-RUN fpm build --compiler gfortran-${GFORT_VERS} --profile "$PROFILE" --link-flag "-static-libgcc -static-libgfortran -Wl,-Bstatic -lquadmath -Wl,-Bdynamic"
-
-RUN find ./build -wholename "*app/syntran" | xargs ls -ltrh
-
+#RUN fpm test test --compiler gfortran-${GFORT_VERS}
+##RUN fpm test long --compiler gfortran-${GFORT_VERS}
+#
+##ARG PROFILE release
+#ARG PROFILE debug
+#
+##RUN fpm build --compiler gfortran-${GFORT_VERS} --profile "$PROFILE" --link-flag "-static-libgcc -static-libgfortran -static-libquadmath"
+#
+#RUN fpm build --compiler gfortran-${GFORT_VERS} --profile "$PROFILE" --link-flag "-static-libgcc -static-libgfortran -Wl,-Bstatic -lquadmath -Wl,-Bdynamic"
+#
+#RUN find ./build -wholename "*app/syntran" | xargs ls -ltrh
+#

samples/array-fns.syntran

@@ -1,7 +1,4 @@
 
-let chain = true;
-//chain = false;
-
 fn mul_mat_vec(mat: [f32; :,:], vec: [f32; :]): [f32; :]
 {
 	// Matrix-vector multiplication.  Return mat * vec
@@ -72,14 +69,7 @@ println(mul_mat_vec(rotx, vec));
 
 // Apply 180 degree x rotation
 
-if chain
-	println(mul_mat_vec(mul_mat(rotx, rotx), vec));
-else
-{
-	let rotxx = mul_mat(rotx, rotx);
-	println(mul_mat_vec(rotxx, vec));
-}
-
+println(mul_mat_vec(mul_mat(rotx, rotx), vec));
 println(mul_mat_vec(mul_mat(rotx, rotx), vec));
 
 // [1.0, -2.0, -3.0]
@@ -89,31 +79,14 @@ println(mul_mat_vec(mul_mat(rotx, rotx), vec));
 // to applying a 180 degree z rotation
 println("calling 1");
 
-// TODO: this is broken.  It should work as a chain of fn calls (without temp
-//// var rotxx) but there's a syntran bug, maybe re deep copy of value_t
-////
-if chain
-	println(mul_mat_vec(mul_mat(mul_mat(mul_mat(rotx, rotx), roty), roty), vec));
-else
-{
-	let rotxx = mul_mat(rotx, rotx);
-	let rotxxy = mul_mat(rotxx, roty);
-	println(mul_mat_vec(mul_mat(rotxxy, roty), vec));
-}
+println(mul_mat_vec(mul_mat(mul_mat(mul_mat(rotx, rotx), roty), roty), vec));
 
 println("done 1");
 // [-1.0, -2.0, 3.0]
 
 println("calling 2");
 
-if chain
-	println(mul_mat(mul_mat(mul_mat(rotx, rotx), roty), roty));
-else
-{
-	let rotxx = mul_mat(rotx, rotx);
-	let rotxxy = mul_mat(rotxx, roty);
-	println(mul_mat(rotxxy, roty));
-}
+println(mul_mat(mul_mat(mul_mat(rotx, rotx), roty), roty));
 
 println("done 2");
 // [

samples/struct.syntran

@@ -0,0 +1,56 @@
+
+struct Time
+{
+	hh: i32,
+	mm: i32,
+	ss: f32,  // trailing comma is optional
+}
+
+let t1 = Time{hh = 9, mm = 20, ss = 0.030,};
+println("t1.hh = ", t1.hh);
+
+let t2 = Time{hh = 13, mm = 37, ss = 0.069,};
+
+fn print_time(t: Time)
+{
+	// You can also do `println("t = ", t);` if you're ok with the default
+	// formatting
+	println("h = ", t.hh);
+	println("m = ", t.mm);
+	println("s = ", t.ss);
+	println();
+	return;
+}
+
+struct Date {
+	d: i32,
+	m: str,
+	y: i64
+}
+
+fn print_date(d: Date)
+{
+	println("y = ", d.y);
+	println("m = ", d.m);
+	println("d = ", d.d);
+	println();
+	return;
+}
+
+let d1 = Date{y = i64(1900) + 12, m = "Apr", d = 14};
+println("d1 =");
+print_date(d1);
+
+println("t1 =");
+print_time(t1);
+
+t2 = t1;
+t2.hh = 11;
+println("t2 = ", t2);
+
+d1 = Date{y = i64(1900) + 45, m = "Ma" + "y", d = 5*4};
+d1.m = "June";
+println("d1 = ", d1);
+
+return 0;
+

src/compiler.F90

@@ -22,17 +22,17 @@ module syntran__compiler_m
 
 #elif defined(__INTEL_COMPILER)
 
-	! Could be ifx or ifort
+	! Could be either ifx or ifort
 	character(len = *), parameter :: fort_compiler = "intel"
 	integer, parameter :: fort_vers(*) = [__INTEL_COMPILER]
 
 #else
 
+#error Neither __GFORTRAN__ nor __INTEL__ are defined.  Please use a supported compiler and compile with pre-processing `-cpp` (gfortran) or `-fpp` (intel)
+
 	character(len = *), parameter :: fort_compiler = "unknown"
 	integer, parameter :: fort_vers(*) = []
 
-#error Neither __GFORTRAN__ nor __INTEL__ are defined.  Please use a supported compiler and compile with pre-processing `-cpp` (gfortran) or `-fpp` (intel)
-
 #endif
 
 	! dev commit is replaced with the git hash by gen-header.sh

src/consts.f90

@@ -9,12 +9,19 @@ module syntran__consts_m
 	integer :: maxerr  ! TODO: move this (not default) into a settings struct that gets passed around
 	integer, parameter :: maxerr_def = 4
 
-	! Must be larger than largest token enum below
+	! Must be larger than largest token enum below.  TODO: add an init check for
+	! this
 	integer, parameter :: magic = 128
 
 	! Token and syntax node kinds enum.  Is there a better way to do this that
 	! allows re-ordering enums?  Currently it would break kind_name()
 	integer, parameter ::          &
+			dot_expr             = 98, &
+			struct_type          = 97, &
+			struct_instance_expr = 96, &
+			struct_declaration   = 95, &
+			struct_keyword       = 94, &
+			dot_token            = 93, &
 			return_statement     = 92, &
 			return_keyword       = 91, &
 			size_array           = 90, &
@@ -213,6 +220,12 @@ function kind_token(kind)
 			"size_array           ", & ! 90
 			"return               ", & ! 91
 			"return statement     ", & ! 92
+			".                    ", & ! 93
+			"struct               ", & ! 94
+			"struct declaration   ", & ! 95
+			"struct instance expr ", & ! 96
+			"struct type          ", & ! 97
+			"dot expression       ", & ! 98
 			"unknown              "  & ! inf
 		]
 
@@ -326,6 +339,12 @@ function kind_name(kind)
 			"size_array          ", & ! 90
 			"return_keyword      ", & ! 91
 			"return_statement    ", & ! 92
+			"dot_token           ", & ! 93
+			"struct_keyword      ", & ! 94
+			"struct_declaration  ", & ! 95
+			"struct_instance_expr", & ! 96
+			"struct_type         ", & ! 97
+			"dot_expr            ", & ! 98
 			"unknown             "  & ! inf (trailing comma hack)
 		]
 			! FIXME: update kind_tokens array too