diff --git a/collects/datalog/pretty.rkt b/collects/datalog/pretty.rkt index 92c8120c99..e58d7d9f8b 100644 --- a/collects/datalog/pretty.rkt +++ b/collects/datalog/pretty.rkt @@ -27,7 +27,7 @@ [(struct literal (_ pred terms)) (h-append (format-datum pred) lparen - (v-concat/s (apply-infix comma (map format-term terms))) + (v-concat/s (apply-infix ", " (map format-term terms))) rparen)])) (define (format-literals ls) (v-concat @@ -40,8 +40,8 @@ (format-literal (clause-head c)) (nest 4 (v-concat/s - (list* (h-append (format-literal (clause-head c)) space (text ":-")) - (apply-infix comma (map format-literal (clause-body c)))))))) + (list* (h-append (format-literal (clause-head c)) space (text ":-") space) + (apply-infix ", " (map format-literal (clause-body c)))))))) (define (format-assertion a) (h-append (format-clause (assertion-clause a)) dot)) diff --git a/collects/datalog/tests/tool/syntax-color.rkt b/collects/datalog/tests/tool/syntax-color.rkt index 16b05f98d0..e13bb0c44c 100644 --- a/collects/datalog/tests/tool/syntax-color.rkt +++ b/collects/datalog/tests/tool/syntax-color.rkt @@ -18,18 +18,18 @@ (test-color "\n" 'whitespace) (test-color "% \n" 'comment) (test-color "% 12 31 2 6\n" 'comment) - (test-color "Var" 'identifier) - (test-color "V124_3" 'identifier) - (test-color "var" 'keyword) - (test-color "123var" 'keyword) + (test-color "Var" 'symbol) + (test-color "V124_3" 'symbol) + (test-color "var" 'identifier) + (test-color "123var" 'identifier) (test-color "(" 'parenthesis) (test-color ")" 'parenthesis) - (test-color "=" 'default) - (test-color "?" 'default) - (test-color "~" 'default) - (test-color "." 'default) - (test-color "," 'default) - (test-color ":-" 'default) + (test-color "=" 'parenthesis) + (test-color "?" 'parenthesis) + (test-color "~" 'parenthesis) + (test-color "." 'parenthesis) + (test-color "," 'parenthesis) + (test-color ":-" 'parenthesis) (test-color "\"foo\"" 'string) (test-color "\"fo\\\"o\"" 'string) (test-color "\"fo\no\"" 'string)