comparison src/elisp/urweb-defs.el @ 1254:935a981f4380

Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents c316ca3c9ec6
children 53f91b67006c
comparison
equal deleted inserted replaced
1198:b52929351402 1254:935a981f4380
106 (urweb-syms-re "let" "struct" "sig" "in" "with" 106 (urweb-syms-re "let" "struct" "sig" "in" "with"
107 "if" "then" "else" "case" "of" "fn" "fun" "val" "and" 107 "if" "then" "else" "case" "of" "fn" "fun" "val" "and"
108 "datatype" "type" "open" "include" 108 "datatype" "type" "open" "include"
109 urweb-module-head-syms 109 urweb-module-head-syms
110 "con" "map" "where" "extern" "constraint" "constraints" 110 "con" "map" "where" "extern" "constraint" "constraints"
111 "table" "sequence" "class" "cookie" "task") 111 "table" "sequence" "class" "cookie" "task" "policy")
112 "Symbols starting an sexp.") 112 "Symbols starting an sexp.")
113 113
114 ;; (defconst urweb-not-arg-start-re 114 ;; (defconst urweb-not-arg-start-re
115 ;; (urweb-syms-re "in" "of" "end" "andalso") 115 ;; (urweb-syms-re "in" "of" "end" "andalso")
116 ;; "Symbols that can't be found at the head of an arg.") 116 ;; "Symbols that can't be found at the head of an arg.")
133 ("if" "else" 0) 133 ("if" "else" 0)
134 (,urweb-=-starter-syms nil) 134 (,urweb-=-starter-syms nil)
135 (("case" "datatype" "if" "then" "else" 135 (("case" "datatype" "if" "then" "else"
136 "let" "open" "sig" "struct" "type" "val" 136 "let" "open" "sig" "struct" "type" "val"
137 "con" "constraint" "table" "sequence" "class" "cookie" 137 "con" "constraint" "table" "sequence" "class" "cookie"
138 "task"))))) 138 "task" "policy")))))
139 139
140 (defconst urweb-starters-indent-after 140 (defconst urweb-starters-indent-after
141 (urweb-syms-re "let" "in" "struct" "sig") 141 (urweb-syms-re "let" "in" "struct" "sig")
142 "Indent after these.") 142 "Indent after these.")
143 143
188 (defconst urweb-starters-syms 188 (defconst urweb-starters-syms
189 (append urweb-module-head-syms 189 (append urweb-module-head-syms
190 '("datatype" "fun" 190 '("datatype" "fun"
191 "open" "type" "val" "and" 191 "open" "type" "val" "and"
192 "con" "constraint" "table" "sequence" "class" "cookie" 192 "con" "constraint" "table" "sequence" "class" "cookie"
193 "task")) 193 "task" "policy"))
194 "The starters of new expressions.") 194 "The starters of new expressions.")
195 195
196 (defconst urweb-exptrail-syms 196 (defconst urweb-exptrail-syms
197 '("if" "then" "else" "case" "of" "fn" "with" "map")) 197 '("if" "then" "else" "case" "of" "fn" "with" "map"))
198 198