Using config.json as the default configuration

Author: jhnaldo

config.json

@@ -1,5 +1,4 @@
 {
-  "testMode": true,
   "silent": true,
   "analyzer": {
     "console": false,
@@ -10,9 +9,9 @@
   "heapBuilder": {
     "maxStrSetSize": 10,
     "recency": false,
-    "heap-clone": false,
-    "callsiteSensitivity": 100,
-    "loopIter": 20,
+    "heap-clone": true,
+    "callsiteSensitivity": 20,
+    "loopIter": 100,
     "loopDepth": 10,
     "snapshot": ""
   }

src/main/scala/kr/ac/kaist/safe/Safe.scala

@@ -24,7 +24,7 @@ object Safe {
   def main(tokens: Array[String]): Unit = {
     (tokens.toList match {
       case str :: args => cmdMap.get(str) match {
-        case Some(cmd) => cmd(args, false)
+        case Some(cmd) => cmd(s"-config=$CONFIG_FILE" :: args, false)
         case None => Failure(NoCmdError(str))
       }
       case Nil => Failure(NoInputError)

src/main/scala/kr/ac/kaist/safe/analyzer/Semantics.scala

@@ -508,9 +508,7 @@ case class Semantics(
       }
       case (NodeUtil.INTERNAL_NOT_YET_IMPLEMENTED, List(expr), None) => {
         val (v, excSet) = V(expr, st);
-        println(s"[NotYetImplemented] $v")
-        println(s"* Sensitivity: ")
-        cp.tracePartition.toStringList.foreach(println)
+        excLog.signal(SemanticsNotYetImplementedError(v, cp))
         (st, excSt)
       }
       case (NodeUtil.INTERNAL_CHAR_CODE, List(expr), None) => {
@@ -1422,7 +1420,7 @@ case class Semantics(
         (st1, excSt ⊔ newExcSt)
       }
       case _ =>
-        excLog.signal(SemanticsNotYetImplementedError(ir))
+        excLog.signal(IRSemanticsNotYetImplementedError(ir))
         (AbsState.Bot, AbsState.Bot)
     }
   }
@@ -1633,7 +1631,7 @@ case class Semantics(
     case CFGInternalValue(ir, name) => getInternalValue(name) match {
       case Some(value) => (value, ExcSetEmpty)
       case None =>
-        excLog.signal(SemanticsNotYetImplementedError(ir))
+        excLog.signal(IRSemanticsNotYetImplementedError(ir))
         (AbsValue.Bot, ExcSetEmpty)
     }
     case CFGVal(ejsVal) =>

src/main/scala/kr/ac/kaist/safe/errors/error/AnalyzeError.scala

@@ -11,6 +11,9 @@
 
 package kr.ac.kaist.safe.errors.error
 
+import kr.ac.kaist.safe.LINE_SEP
+import kr.ac.kaist.safe.analyzer.domain.AbsValue
+import kr.ac.kaist.safe.analyzer.ControlPoint
 import kr.ac.kaist.safe.nodes.ir.IRNode
 import kr.ac.kaist.safe.util.UserAllocSite
 
@@ -37,11 +40,17 @@ case class UndefinedFunctionCallError(ir: IRNode) extends AnalyzeIRNodeError({
   "CFGConstruct/CFGCall tried to call undefined function"
 }, ir)
 
-case class SemanticsNotYetImplementedError(ir: IRNode) extends AnalyzeIRNodeError({
+case class IRSemanticsNotYetImplementedError(ir: IRNode) extends AnalyzeIRNodeError({
   "Semantics for this node is not implemented yet"
 }, ir)
 
 // other errors
+case class SemanticsNotYetImplementedError(v: AbsValue, cp: ControlPoint) extends AnalyzeError({
+  s"[NotYetImplemented] $v" + LINE_SEP +
+    s"* Sensitivity: " + LINE_SEP +
+    cp.tracePartition.toStringList.mkString(LINE_SEP)
+})
+
 case class ContextAssertionError(funName: String, msg: String) extends AnalyzeError(
   s"[Assert:$funName]: $msg"
 )

src/main/scala/kr/ac/kaist/safe/package.scala

@@ -33,6 +33,9 @@ package object safe {
   // Base project directory root
   val CUR_DIR = System.getProperty("user.dir")
 
+  // Configuration file
+  val CONFIG_FILE = BASE_DIR + SEP + "config.json"
+
   // Predefined variables
   val PRED_VARS = List(
     // 4.2 Language Overview

src/main/scala/kr/ac/kaist/safe/phase/Analyze.scala

@@ -50,7 +50,7 @@ case object Analyze extends PhaseObj[(CFG, Semantics, TracePartition, HeapBuildC
 
     // Report errors.
     val excLog = sem.excLog
-    if (excLog.hasError) {
+    if (!safeConfig.testMode && excLog.hasError) {
       println(cfg.fileName + ":")
       println(excLog)
     }

src/main/scala/kr/ac/kaist/safe/web/WebServer.scala

@@ -110,7 +110,7 @@ object WebServer extends {
                 val testSafeConfig: SafeConfig = SafeConfig(CmdBase, Nil)
                 val parser = new ArgParser(CmdBase, testSafeConfig)
                 val heapBuildConfig = HeapBuild.defaultConfig
-                val testJSON = Useful.path("config.json")
+                val testJSON = CONFIG_FILE
                 parser.addRule(heapBuildConfig, HeapBuild.name, HeapBuild.options)
                 parser(List(s"-config=$testJSON"))
 

src/test/scala/kr/ac/kaist/safe/AnalyzeTest.scala

@@ -27,7 +27,7 @@ abstract class AnalyzeTest extends SafeTest {
   // analysis configuration
   val heapBuildConfig = HeapBuild.defaultConfig
   val analyzeConfig = Analyze.defaultConfig
-  val configFile = BASE_DIR + SEP + "config.json"
+  val configFile = CONFIG_FILE
 
   // check prefix of abstract strings
   def prefixCheck(prefix: String): (AbsStr, AbsDataProp) => Boolean = {

src/test/scala/kr/ac/kaist/safe/SafeTest.scala

@@ -22,7 +22,11 @@ abstract class SafeTest extends FunSuite {
   lazy val testDir = BASE_DIR + SEP + "tests" + SEP
 
   // safe configuration
-  lazy val safeConfig: SafeConfig = SafeConfig(CmdBase, Nil)
+  lazy val safeConfig: SafeConfig = SafeConfig(
+    command = CmdBase,
+    fileNames = Nil,
+    testMode = true
+  )
 
   ////////////////////////////////////////////////////////////////////////////////
   // Helper Functions