Merge pull request #24 from gsdlab/i235

I235
gsdlab · Jun 28, 2013 · 9735196 · 9735196
2 parents b3db52c + 2040790
commit 9735196
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/Language/Clafer/Intermediate/SimpleScopeAnalyzer.hs b/src/Language/Clafer/Intermediate/SimpleScopeAnalyzer.hs
@@ -110,8 +110,10 @@ analyzeReferences clafers analysis (IEClafer clafer) =
     where
     lowerBound = fst (fromJust $ card clafer)
     analysis'
-        | isReference clafer = Map.insert (uid $ fromJust $ directSuper clafers clafer) lowerBound analysis
-        | otherwise          = analysis
+        | isReference clafer = case (directSuper clafers clafer) of 
+            (Just c) -> Map.insert (uid c) lowerBound analysis
+            Nothing -> analysis
+        | otherwise          = analysis 
 analyzeReferences _ analysis _ = analysis
 
 

diff --git a/test/positive/i235.cfr b/test/positive/i235.cfr
@@ -0,0 +1,3 @@
+abstract A
+
+aRef -> A
diff --git a/test/test-suite.hs b/test/test-suite.hs
@@ -76,4 +76,14 @@ case_compileTest = do
 					clafers <- positiveClafers
 					let compiledClafers = map (\(file, model) -> (file, compileOneFragment defaultClaferArgs model)) clafers
 					forM_ compiledClafers (\(file, compiled) -> when (not $ compiledCheck compiled) $ putStrLn (file ++ " Error: " ++ (show $ fromLeft compiled)))
-					(andMap (compiledCheck . snd) compiledClafers) @? "test/positive fail: The above claferModels did not compile."
+					(andMap (compiledCheck . snd) compiledClafers) @? "test/positive fail: The above claferModels did not compile."
+
+case_refrence_Unused_Absstract_Clafer :: Assertion
+case_refrence_Unused_Absstract_Clafer = do
+				model <- readFile "positive/i235.cfr"
+				let compiledClafers = 
+					[("None", compileOneFragment defaultClaferArgs{scope_strategy = Just None} model), ("Simple", compileOneFragment defaultClaferArgs{scope_strategy = Just Simple} model), ("Full", compileOneFragment defaultClaferArgs{scope_strategy = Just Full} model)]
+				forM_ compiledClafers (\(ss, compiled) -> 
+					when (not $ compiledCheck compiled) $ putStrLn ("i235.cfr failed for scope_strategy = " ++ ss))
+				(andMap (compiledCheck . snd) compiledClafers 
+					@? "refrence_Unused_Absstract_Clafer (i235) failed, error for refrencing unused abstract clafer")