From 8fd437d877a2a1ea4e6704d5970d05805fcd0c51 Mon Sep 17 00:00:00 2001 From: John Benediktsson <mrjbq7@gmail.com> Date: Mon, 28 Sep 2020 16:29:43 -0700 Subject: [PATCH] Revert "core: Add TH{ for making assoc tuples." This reverts commit e93d8f82bcaee839d261235b85d42e2487feb2f4. --- core/bootstrap/syntax.factor | 1 - core/classes/tuple/parser/parser.factor | 10 ---------- core/syntax/syntax.factor | 1 - 3 files changed, 12 deletions(-) diff --git a/core/bootstrap/syntax.factor b/core/bootstrap/syntax.factor index b5e2fcf8d4..7861e36c84 100644 --- a/core/bootstrap/syntax.factor +++ b/core/bootstrap/syntax.factor @@ -48,7 +48,6 @@ IN: bootstrap.syntax "final" "SLOT:" "T{" - "TH{" "UNION:" "INTERSECTION:" "USE:" diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor index 12667ffb5d..1521919190 100644 --- a/core/classes/tuple/parser/parser.factor +++ b/core/classes/tuple/parser/parser.factor @@ -115,15 +115,5 @@ M: tuple-class boa>object [ bad-literal-tuple ] } case ; -: parse-tuple-hash-literal-slots ( class slots -- tuple ) - scan-token { - { "{" [ 2dup parse-slot-values assoc>object ] } - { "}" [ drop new ] } - [ bad-literal-tuple ] - } case ; - : parse-tuple-literal ( -- tuple ) scan-word dup all-slots parse-tuple-literal-slots ; - -: parse-tuple-hash-literal ( -- tuple ) - scan-word dup all-slots parse-tuple-hash-literal-slots ; diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor index d6ce678e4d..a3fdaf3713 100644 --- a/core/syntax/syntax.factor +++ b/core/syntax/syntax.factor @@ -105,7 +105,6 @@ IN: bootstrap.syntax "BV{" [ \ } [ >byte-vector ] parse-literal ] define-core-syntax "H{" [ \ } [ parse-hashtable ] parse-literal ] define-core-syntax "T{" [ parse-tuple-literal suffix! ] define-core-syntax - "TH{" [ parse-tuple-hash-literal suffix! ] define-core-syntax "W{" [ \ } [ first <wrapper> ] parse-literal ] define-core-syntax "HS{" [ \ } [ >hash-set ] parse-literal ] define-core-syntax