Merge branch 'master' of github.com:UCSD-PL/algorithmic-software-veri…

…fication asdasd
panagosg7 · May 2, 2013 · e2e9a09 · e2e9a09
2 parents ddb91ad + 71e94ea
commit e2e9a09
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,7 @@
+*.log
+*.pyc
 *.swp
 *.swo
+*.vc
+/assignments/*/tests/logs
+/assignments/*/dist*
diff --git a/assignments/hw1-nanojs/tests/logs/.gitkeep b/assignments/hw1-nanojs/tests/logs/.gitkeep
diff --git a/assignments/hw1-nanojs/tests/neg/locks-loop-fun.js b/assignments/hw1-nanojs/tests/neg/locks-loop-fun.js
@@ -30,11 +30,11 @@ function main(){
   var l    = create();
 
   while (0 < n){
-    if (0 < flag){ 
-      l = lock(l) 
+    if (0 < flag){
+      l = acquire(l)
     }
-    if (0 <= flag){ 
-      l = unlock(l) 
+    if (0 <= flag){
+      l = release(l)
     }
     n = n - 1;
   }

diff --git a/assignments/hw1-nanojs/tests/neg/locks.js b/assignments/hw1-nanojs/tests/neg/locks.js
@@ -21,8 +21,8 @@ function release(l){
 function main(){
   var l = create();
   var x = random();
-  if (0 <  x){ l = lock(l); }
-  if (0 <= x){ l = unlock(l); }
+  if (0 <  x){ l = acquire(l); }
+  if (0 <= x){ l = release(l); }
   assert(l == 0);
 }
 

diff --git a/assignments/hw1-nanojs/tests/pos/foo-fun.js b/assignments/hw1-nanojs/tests/pos/foo-fun.js