about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorCristian Cadar <cristic@cs.stanford.edu>2011-07-24 23:34:38 +0000
committerCristian Cadar <cristic@cs.stanford.edu>2011-07-24 23:34:38 +0000
commita0f86b88094721fb3b9118916e9314cdc180f1a9 (patch)
tree3d15c48b88c2eb2bb2a79a1861bfb7be951f9384
parent9e830a45f39118a68e0bde690062af85ab3a2a8e (diff)
downloadklee-a0f86b88094721fb3b9118916e9314cdc180f1a9.tar.gz
Applied patch by Leandro Sales that makes Kleaver compatible with the
recent changes to array names.  Modified FastCexSolver.pc to catch
this issue.



git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@135896 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Expr/Lexer.cpp2
-rw-r--r--test/Solver/FastCexSolver.pc6
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/Expr/Lexer.cpp b/lib/Expr/Lexer.cpp
index 84e2c185..95d6072b 100644
--- a/lib/Expr/Lexer.cpp
+++ b/lib/Expr/Lexer.cpp
@@ -61,7 +61,7 @@ void Token::dump() {
 ///
 
 static inline bool isInternalIdentifierChar(int Char) {
-  return isalnum(Char) || Char == '_' || Char == '.';
+  return isalnum(Char) || Char == '_' || Char == '.' || Char == '-';
 }
 
 Lexer::Lexer(const llvm::MemoryBuffer *MB) 
diff --git a/test/Solver/FastCexSolver.pc b/test/Solver/FastCexSolver.pc
index 10cdce48..b8f839c3 100644
--- a/test/Solver/FastCexSolver.pc
+++ b/test/Solver/FastCexSolver.pc
@@ -4,9 +4,7 @@
 array arr1[4] : w32 -> w8 = symbolic
 (query [] (Not (Eq 4096 (ReadLSB w32 0 arr1))))
 
-array arr2[2] : w32 -> w8 = symbolic
-(query [(Ule (Add w8 208 N0:(Read w8 0 arr2))
+array A-data[2] : w32 -> w8 = symbolic
+(query [(Ule (Add w8 208 N0:(Read w8 0 A-data))
              9)]
        (Eq 52 N0))
-
-