Add basic support for interface blocks

src/ast.fs

@@ -71,7 +71,8 @@ and Expr =
 
 and TypeSpec =
     | TypeName of string
-    | TypeStruct of string(*type*) * Ident option(*name*) * Decl list
+    // e.g. struct foo { float x; float y; }
+    | TypeBlock of string(*type*) * Ident option(*name*) * Decl list
 
 and Type = {
     name: TypeSpec // e.g. int
@@ -85,7 +86,7 @@ and Type = {
     override t.ToString() =
         let name = match t.name with
                    | TypeName n -> n
-                   | TypeStruct _ -> $"{t.name}"
+                   | TypeBlock _ -> $"{t.name}"
         if t.typeQ.IsEmpty && t.arraySizes.IsEmpty
             then $"{name}"
             else $"<{t.typeQ} {name} {t.arraySizes}>"

src/parse.fs

@@ -175,7 +175,7 @@ type private ParseImpl() =
         pipe2 name (between (ch '{') (ch '}') decls)
             (fun n d ->
                 Option.iter (fun (i:Ast.Ident) -> forbiddenNames <- i.Name::forbiddenNames) n
-                Ast.TypeStruct(prefix, n, d))
+                Ast.TypeBlock(prefix, n, d))
 
     let structSpecifier = parse {
         let! str = keyword "struct"

src/printer.fs

@@ -150,7 +150,7 @@ type PrinterImpl(outputFormat) =
 
     and typeSpecToS = function
         | TypeName s -> s
-        | TypeStruct(prefix, id, decls) -> structToS prefix id decls
+        | TypeBlock(prefix, id, decls) -> structToS prefix id decls
 
     and typeToS (ty: Type) =
         let get = function

src/renamer.fs

@@ -330,8 +330,18 @@ module private RenamerImpl =
             renList env renCase cl |> ignore<Env>
             env
 
+    // e.g. struct foo { int a; float b; }
+    //   or uniform foo { int a; float b; }
+    let renTyBlock (env: Env) = function
+        | TypeBlock("struct", _, _) -> env
+        | TypeBlock(_, _, fields) ->
+            // treat the fields as if they were global variables
+            renList env (renDecl true) fields
+        | _ -> env
+
     let rec renTopLevelName env = function
         | TLDecl d -> renDecl true env d
+        | TypeDecl tyDecl -> renTyBlock env tyDecl
         | Function(fct, _) -> renFctName env fct
         | _ -> env
 

tests/commands.txt

@@ -30,6 +30,7 @@
 --preprocess --no-remove-unused --no-renaming --format indented -o tests/unit/preprocess_if.frag.expected tests/unit/preprocess_if.frag
 --no-remove-unused --no-renaming --format indented -o tests/unit/shadowing.frag.expected tests/unit/shadowing.frag
 --no-remove-unused --no-renaming --format indented -o tests/unit/precedence.frag.expected tests/unit/precedence.frag
+--no-remove-unused --format indented -o tests/unit/interface_block.frag.expected tests/unit/interface_block.frag
 
 # Unused removal tests
 

tests/unit/interface_block.frag

@@ -0,0 +1,10 @@
+uniform MyBlock
+{
+  vec3 color; // treated as a global variable
+  float alpha;
+};
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord)
+{
+    fragColor = vec4(color, alpha);
+}

tests/unit/interface_block.frag.expected

@@ -0,0 +1,4 @@
+uniform MyBlock{vec3 M;float v;};void mainImage(out vec4 m,vec2 B)
+{
+  m=vec4(M,v);
+}