toml: minor cleanup, note a fixme for later.
							parent
							
								
									c1ebf5451f
								
							
						
					
					
						commit
						689c18c374
					
				| 
						 | 
					@ -13,6 +13,8 @@ ERROR: unknown-value value ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<PRIVATE
 | 
					<PRIVATE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					! FIXME: key = 1234abcd # should error!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TUPLE: table name array? entries ;
 | 
					TUPLE: table name array? entries ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TUPLE: entry key value ;
 | 
					TUPLE: entry key value ;
 | 
				
			||||||
| 
						 | 
					@ -167,7 +169,7 @@ DEFER: value-parser
 | 
				
			||||||
        "[" token hide ,
 | 
					        "[" token hide ,
 | 
				
			||||||
        whitespace hide ,
 | 
					        whitespace hide ,
 | 
				
			||||||
        value-parser
 | 
					        value-parser
 | 
				
			||||||
        whitespace hide "," token whitespace hide 3seq list-of ,
 | 
					        whitespace "," token whitespace pack list-of ,
 | 
				
			||||||
        whitespace hide ,
 | 
					        whitespace hide ,
 | 
				
			||||||
        "]" token hide ,
 | 
					        "]" token hide ,
 | 
				
			||||||
    ] seq* [ first { } like ] action ;
 | 
					    ] seq* [ first { } like ] action ;
 | 
				
			||||||
| 
						 | 
					@ -179,7 +181,7 @@ DEFER: key-value-parser
 | 
				
			||||||
        "{" token hide ,
 | 
					        "{" token hide ,
 | 
				
			||||||
        whitespace hide ,
 | 
					        whitespace hide ,
 | 
				
			||||||
        key-value-parser
 | 
					        key-value-parser
 | 
				
			||||||
        whitespace hide "," token whitespace hide 3seq list-of ,
 | 
					        whitespace "," token whitespace pack list-of ,
 | 
				
			||||||
        whitespace hide ,
 | 
					        whitespace hide ,
 | 
				
			||||||
        "}" token hide ,
 | 
					        "}" token hide ,
 | 
				
			||||||
    ] seq* [ first >hashtable ] action ;
 | 
					    ] seq* [ first >hashtable ] action ;
 | 
				
			||||||
| 
						 | 
					@ -194,8 +196,8 @@ DEFER: key-value-parser
 | 
				
			||||||
            float-parser ,
 | 
					            float-parser ,
 | 
				
			||||||
            integer-parser ,
 | 
					            integer-parser ,
 | 
				
			||||||
            string-parser ,
 | 
					            string-parser ,
 | 
				
			||||||
            [ array-parser ] box ,
 | 
					            array-parser ,
 | 
				
			||||||
            [ inline-table-parser ] box ,
 | 
					            inline-table-parser ,
 | 
				
			||||||
        ] choice*
 | 
					        ] choice*
 | 
				
			||||||
    ] delay ;
 | 
					    ] delay ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -210,7 +212,7 @@ DEFER: key-value-parser
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: comment-parser ( -- parser )
 | 
					: comment-parser ( -- parser )
 | 
				
			||||||
    [
 | 
					    [
 | 
				
			||||||
        space ,
 | 
					        space hide ,
 | 
				
			||||||
        "#" token ,
 | 
					        "#" token ,
 | 
				
			||||||
        [ CHAR: \n = not ] satisfy repeat0 ,
 | 
					        [ CHAR: \n = not ] satisfy repeat0 ,
 | 
				
			||||||
    ] seq* [ drop f ] action ;
 | 
					    ] seq* [ drop f ] action ;
 | 
				
			||||||
| 
						 | 
					@ -237,7 +239,7 @@ DEFER: key-value-parser
 | 
				
			||||||
        begin token hide ,
 | 
					        begin token hide ,
 | 
				
			||||||
        space hide ,
 | 
					        space hide ,
 | 
				
			||||||
        name-parser
 | 
					        name-parser
 | 
				
			||||||
        space hide "." token space hide 3seq list-of
 | 
					        space "." token space pack list-of
 | 
				
			||||||
        [ { } like ] action ,
 | 
					        [ { } like ] action ,
 | 
				
			||||||
        space hide ,
 | 
					        space hide ,
 | 
				
			||||||
        end token hide ,
 | 
					        end token hide ,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue