steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Add TH{ for making assoc tuples. 

See #1449.
https://github.com/factor/factor/issues/1449
char-rename
Doug Coleman 2017-05-30 20:14:29 -05:00
parent f3bbc30c8a
commit e93d8f82bc
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/bootstrap/syntax.factor
View File

@ -48,6 +48,7 @@ IN: bootstrap.syntax
"final" "final"
"SLOT:" "SLOT:"
"T{" "T{"
"TH{"
"UNION:" "UNION:"
"INTERSECTION:" "INTERSECTION:"
"USE:" "USE:"

10
core/classes/tuple/parser/parser.factor
View File

@ -115,5 +115,15 @@ M: tuple-class boa>object
[ bad-literal-tuple ] [ bad-literal-tuple ]
} case ; } 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 ) : parse-tuple-literal ( -- tuple )
scan-word dup all-slots parse-tuple-literal-slots ; scan-word dup all-slots parse-tuple-literal-slots ;
: parse-tuple-hash-literal ( -- tuple )
scan-word dup all-slots parse-tuple-hash-literal-slots ;

1
core/syntax/syntax.factor
View File

@ -105,6 +105,7 @@ IN: bootstrap.syntax
"BV{" [ \ } [ >byte-vector ] parse-literal ] define-core-syntax "BV{" [ \ } [ >byte-vector ] parse-literal ] define-core-syntax
"H{" [ \ } [ parse-hashtable ] parse-literal ] define-core-syntax "H{" [ \ } [ parse-hashtable ] parse-literal ] define-core-syntax
"T{" [ parse-tuple-literal suffix! ] 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 "W{" [ \ } [ first <wrapper> ] parse-literal ] define-core-syntax
"HS{" [ \ } [ >hash-set ] parse-literal ] define-core-syntax "HS{" [ \ } [ >hash-set ] parse-literal ] define-core-syntax