8 files changed, 30 insertions, 11 deletions
diff --git a/dhall/src/syntax/ast/span.rs b/dhall/src/syntax/ast/span.rs
index 50985e1..153a624 100644
--- a/dhall/src/syntax/ast/span.rs
+++ b/dhall/src/syntax/ast/span.rs
@@ -22,6 +22,7 @@ pub(crate) enum Span {
     DuplicateRecordFieldsSugar,
     DottedFieldSugar,
     WithSugar,
+    RecordPunSugar,
     /// For expressions obtained from decoding binary
     Decoded,
     /// For expressions constructed during normalization/typecheck
diff --git a/dhall/src/syntax/text/dhall.pest.visibility b/dhall/src/syntax/text/dhall.pest.visibility
index 0ff1bfe..2a89076 100644
--- a/dhall/src/syntax/text/dhall.pest.visibility
+++ b/dhall/src/syntax/text/dhall.pest.visibility
@@ -184,6 +184,8 @@ non_empty_record_type
 record_type_entry
 non_empty_record_literal
 record_literal_entry
+# record_literal_punned_entry
+# record_literal_normal_entry
 union_type
 empty_union_type
 # non_empty_union_type
diff --git a/dhall/src/syntax/text/parser.rs b/dhall/src/syntax/text/parser.rs
index f59cf06..b3c2c40 100644
--- a/dhall/src/syntax/text/parser.rs
+++ b/dhall/src/syntax/text/parser.rs
@@ -954,6 +954,11 @@ impl DhallParser {
 
     fn record_literal_entry(input: ParseInput) -> ParseResult<(Label, Expr)> {
         Ok(match_nodes!(input.into_children();
+            [label(name)] => {
+                // Desugar record pun into a variable
+                let expr = Expr::new(Var(name.clone().into()), Span::RecordPunSugar);
+                (name, expr)
+            },
             [label(name), expression(expr)] => (name, expr),
             [label(first_name), label(names).., expression(expr)] => {
                 // Desugar dotted field syntax into nested records
diff --git a/dhall/src/syntax/text/printer.rs b/dhall/src/syntax/text/printer.rs
index 5bb987b..a8991b0 100644
--- a/dhall/src/syntax/text/printer.rs
+++ b/dhall/src/syntax/text/printer.rs
@@ -357,7 +357,7 @@ impl Display for Label {
         let s = String::from(self);
         let is_reserved = match s.as_str() {
             "let" | "in" | "if" | "then" | "else" | "Type" | "Kind"
-            | "Sort" | "True" | "False" => true,
+            | "Sort" | "True" | "False" | "Some" => true,
             _ => crate::syntax::Builtin::parse(&s).is_some(),
         };
         if !is_reserved && s.chars().all(|c| c.is_ascii_alphanumeric()) {
diff --git a/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt b/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt
index f6427a4..b08c143 100644
--- a/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt
+++ b/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt
@@ -3,4 +3,4 @@
 1 | { x :T }␊
   |   ^---
   |
-  = expected non_empty_record_type_or_literal or empty_record_literal
+  = expected missing, if_, merge, NaN, Some_, toMap, assert, forall, record_type_entry, or empty_record_literal
diff --git a/dhall/tests/parser/failure/unit/RecordLitPunDotted.txt b/dhall/tests/parser/failure/unit/RecordLitPunDotted.txt
new file mode 100644
index 0000000..2e0ac22
--- /dev/null
+++ b/dhall/tests/parser/failure/unit/RecordLitPunDotted.txt
@@ -0,0 +1,6 @@
+ --> 1:7
+  |
+1 | { x.y.z }␊
+  |       ^---
+  |
+  = expected missing, if_, merge, NaN, Some_, toMap, assert, or forall
diff --git a/tests_buffer b/tests_buffer
index de49f25..74e76bc 100644
--- a/tests_buffer
+++ b/tests_buffer
@@ -3,18 +3,20 @@ parser:
 ./"a%20b"
 text interpolation and escapes
 projection by expression unit tests
-fix fakeurlencode test
+x.({ a : Bool, b })
+x.({ a })
+x.{ a : Bool }
 s/QuotedVariable/VariableQuoted/
 
-binary decoding:
-decode old-style optional literals ?
-
 import:
 failure/
     don't recover cycle
     don't resolve symlinks in canonicalizing
 
 normalization:
+move builtins and operators in their own folder ?
+RecordSortFields { b = 1, a = 0 }
+RecordTypeSortFields { b : Bool, a : Natural }
 
 type-inference:
 something that involves destructuring a recordtype after merge
diff --git a/update-tests.sh b/update-tests.sh
index 7be40c4..ce5a67c 100755
--- a/update-tests.sh
+++ b/update-tests.sh
@@ -75,16 +75,18 @@ function generate_output_file() {
     file="$2"
     INPUT_FILE="$(${folder}_input_file "$file")"
     OUTPUT_FILE="$(${folder}_output_file "$file")"
+
     if [ ! -f "$OUTPUT_FILE" ]; then
         echo "$OUTPUT_FILE"
         ${folder}_process "$INPUT_FILE" > "$tmpfile"
         if [ $? -eq 0 ]; then
             mv "$tmpfile" "$OUTPUT_FILE"
-            if [ "$folder" = "parser" ]; then
-                cat "$OUTPUT_FILE" | cbor2diag.rb > "${file}B.diag"
-            fi
         fi
     fi
+
+    if [ -f "$OUTPUT_FILE" -a "$folder" = "parser" -a ! -f "${file}B.diag" ]; then
+        cat "$OUTPUT_FILE" | cbor2diag.rb > "${file}B.diag"
+    fi
 }
 
 if [ "$1" = "missing" ]; then
@@ -94,7 +96,7 @@ if [ "$1" = "missing" ]; then
             # This is not robust to spaces in filenames, but hopefully there should be none
             fd 'A\.dhallb?$' "$root/$folder/success" \
                 | sed 's/A.dhallb\?$//' \
-                | while read file; do
+                | while read -r file; do
                     generate_output_file "$folder" "$file"
                 done
         done
@@ -105,10 +107,11 @@ elif [ "$1" = "add" ]; then
     #   normalization/unit/TextShowEmpty Text/show ""
     # This will add a test to the local tests folder for each such line, and generate
     # the output using the `dhall` command in the PATH.
-    while read file contents; do
+    while read -r file contents; do
         folder="$(echo "$file" | cut -d/ -f1)"
         is_success="$(echo "$file" | cut -d/ -f2)"
         file="./dhall/tests/$file"
+        # file="./dhall-lang/tests/$file"
         mkdir -p "$(dirname "$file")"
 
         if [ "$is_success" = "success" ]; then