@@ -64,7 +64,7 @@ allvars(sym::Symbol) = [sym]
64
64
allvars (v:: Any ) = Array (Symbol, 0 )
65
65
66
66
# special operators in formulas
67
- const specials = Set (:+ , :- , :* , :/ , :& , :| , :^ )
67
+ const specials = Set ([ :+ , :- , :* , :/ , :& , :| , :^ ] )
68
68
69
69
function dospecials (ex:: Expr )
70
70
if ex. head != :call error (" Non-call expression encountered" ) end
@@ -84,7 +84,7 @@ function dospecials(ex::Expr)
84
84
end
85
85
dospecials (a:: Any ) = a
86
86
87
- const associative = Set (:+ ,:* ,:& ) # associative special operators
87
+ const associative = Set ([ :+ ,:* ,:& ] ) # associative special operators
88
88
89
89
# # If the expression is a call to the function s return its arguments
90
90
# # Otherwise return the expression
@@ -117,7 +117,7 @@ getterms(a::Any) = a
117
117
ord (ex:: Expr ) = (ex. head == :call && ex. args[1 ] == :& ) ? length (ex. args)- 1 : 1
118
118
ord (a:: Any ) = 1
119
119
120
- const nonevaluation = Set (:& ,:| ) # operators constructed from other evaluations
120
+ const nonevaluation = Set ([ :& ,:| ] ) # operators constructed from other evaluations
121
121
# # evaluation terms - the (filtered) arguments for :& and :|, otherwise the term itself
122
122
function evt (ex:: Expr )
123
123
if ex. head != :call error (" Non-call expression encountered" ) end
@@ -146,7 +146,7 @@ function Terms(f::Formula)
146
146
unshift! (oo, 1 )
147
147
end
148
148
ev = unique (vcat (etrms... ))
149
- facs = int8 (hcat (map (x-> (s= Set (x... );map (t-> int8 (t in s), ev)),etrms)... ))
149
+ facs = int8 (hcat (map (x-> (s= Set (x);map (t-> int8 (t in s), ev)),etrms)... ))
150
150
Terms (tt, ev, facs, oo, haslhs, ! any (noint))
151
151
end
152
152
0 commit comments