Merge pull request #2180 from GaloisInc/1994-functions-in-records

Allow function types in records without parentheses
GaloisInc · Jan 15, 2025 · da1cf80 · da1cf80
2 parents fce73f3 + 01ecfd2
commit da1cf80
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,9 @@
 
 ## Bug fixes
 
+* Function types in records no longer require gratuitous parentheses.
+(#1994)
+
 * Unexpected special-case type behavior of monad binds in the
   syntactic top level has been removed.
   (This was _not_ specifically associated with the TopLevel monad, so

diff --git a/intTests/test1994/test.saw b/intTests/test1994/test.saw
@@ -0,0 +1 @@
+let thing : { fn: Int -> Int } = { fn = \x -> x };
diff --git a/intTests/test1994/test.sh b/intTests/test1994/test.sh
@@ -0,0 +1,3 @@
+set -e
+
+$SAW test.saw
diff --git a/src/SAWScript/Parser.y b/src/SAWScript/Parser.y
@@ -214,7 +214,7 @@ Type :: { Type }
  | BaseType '->' Type                   { tFun (maxSpan [$1, $3]) $1 $3 }
 
 FieldType :: { (Name, Type) }
-  : name ':' BaseType                   { (tokStr $1, $3)         }
+  : name ':' Type                       { (tokStr $1, $3)         }
 
 BaseType :: { Type }
  : name                                 { tVar (getPos $1) (tokStr $1)  }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		let thing : { fn: Int -> Int } = { fn = \x -> x };