Browse files

Fixed bugs in ast-invocation and friends (used to work with conda, now

had to change to a conde).
  • Loading branch information...
cderoove committed Feb 1, 2013
1 parent 08f9556 commit 70cb503b730dbe2ca8f97e93097ae23b7919d2cd
Showing with 9 additions and 9 deletions.
  1. +8 −8 EkekoPlugin/src/damp/ekeko/jdt/reification.clj
  2. +1 −1 EkekoPlugin/src/damp/ekeko/logic.clj
@@ -242,7 +242,7 @@
Binary predicate ast/2
API documentation of org.eclipse.jdt.core.dom.IBinding"
[?key ?ast]
- (let [keys (astnode/ekeko-keywords-for-resolveable-ast-classes)]
+ (let [keys astnode/ekeko-keywords-for-resolveable-ast-classes]
(contains keys ?key)
(ast ?key ?ast))))
@@ -255,7 +255,7 @@
See also:
Binary predicate ast/2"
[?key ?ast]
- (let [declaration-keywords (astnode/ekeko-keywords-for-declaration-ast-classes)]
+ (let [declaration-keywords astnode/ekeko-keywords-for-declaration-ast-classes]
(contains declaration-keywords ?key)
(ast ?key ?ast))))
@@ -269,14 +269,14 @@
Note that ?ast can be an instance of FieldAccess,
SuperFieldAccess, SimpleName or QualifiedName."
[?key ?node]
- (conda [(v- ?node)
+ (conde [(v- ?node)
(ast :FieldAccessLike ?node)
(ast ?key ?node)]
[(v+ ?node)
(fresh [?n]
- (ast :FieldAccessLike ?n)
- (== ?n ?node))]))
+ (ast :FieldAccessLike ?n)
+ (== ?n ?node))]))
"Like ast/2, but ensures ?type is an
@@ -323,7 +323,7 @@
SuperMethodInvocation, ClassInstanceCreation,
ConstructorInvocation or SuperConstructorInvocation"
[?key ?node]
- (conda [(v- ?node)
+ (conde [(v- ?node)
(ast :MethodInvocationLike ?node)
(ast ?key ?node)]
[(v+ ?node)
@@ -334,7 +334,7 @@
:SuperConstructorInvocation] ?key) ;TODO: define a constant for this
@@ -19,7 +19,7 @@
:else nil)))
;;TODO: move to a project with multiple, regular core.logic logic variables
-;;TODO: move to constraints such that the evaluating of the expression can be delayed until all variables are bound
+;;TODO: move to constraints such that the evaluation of the expression can be delayed until all variables are bound
"Non-relational. Projects all logic variables on the right-hand side

0 comments on commit 70cb503

Please sign in to comment.