svf-tools 1.0.486 → 1.0.489

package/SVF-doxygen/html/html/globals_func_g.html

@@ -79,6 +79,9 @@ $(function() {
 <li>getenv()
 : <a class="el" href="util_8h.html#aee28fd8a0e40b6d958f7d20348e45368">util.h</a>
 </li>
+<li>getJsonFile()
+: <a class="el" href="ExtAPI_8cpp.html#a5e6188ceb5d9d599bd8f4ada2bd4e645">ExtAPI.cpp</a>
+</li>
 <li>getLargest()
 : <a class="el" href="cuddInt_8c.html#a6506f1ae80b0f85d1e01da0db4a4f31a">cuddInt.c</a>
 </li>
@@ -98,6 +101,9 @@ $(function() {
 : <a class="el" href="util_8c.html#a6df944867e592afe693884f4395a7d6b">util.c</a>
 , <a class="el" href="util_8h.html#a483a36453687145fd533bdb6694bad89">util.h</a>
 </li>
+<li>GetStdoutFromCommand()
+: <a class="el" href="ExtAPI_8cpp.html#acf93365b9c9e5e35c979a671ee600409">ExtAPI.cpp</a>
+</li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->

package/SVF-doxygen/html/html/globals_g.html

@@ -100,6 +100,9 @@ $(function() {
 <li>getenv()
 : <a class="el" href="util_8h.html#aee28fd8a0e40b6d958f7d20348e45368">util.h</a>
 </li>
+<li>getJsonFile()
+: <a class="el" href="ExtAPI_8cpp.html#a5e6188ceb5d9d599bd8f4ada2bd4e645">ExtAPI.cpp</a>
+</li>
 <li>getLargest()
 : <a class="el" href="cuddInt_8c.html#a6506f1ae80b0f85d1e01da0db4a4f31a">cuddInt.c</a>
 </li>
@@ -116,8 +119,11 @@ $(function() {
 : <a class="el" href="cuddInt_8c.html#a048492e5cad979aad3c0540ff82a4824">cuddInt.c</a>
 </li>
 <li>getSoftDataLimit()
-: <a class="el" href="util_8c.html#a6df944867e592afe693884f4395a7d6b">util.c</a>
-, <a class="el" href="util_8h.html#a483a36453687145fd533bdb6694bad89">util.h</a>
+: <a class="el" href="util_8h.html#a483a36453687145fd533bdb6694bad89">util.h</a>
+, <a class="el" href="util_8c.html#a6df944867e592afe693884f4395a7d6b">util.c</a>
+</li>
+<li>GetStdoutFromCommand()
+: <a class="el" href="ExtAPI_8cpp.html#acf93365b9c9e5e35c979a671ee600409">ExtAPI.cpp</a>
 </li>
 <li>global_error
 : <a class="el" href="cJSON_8cpp.html#a6ff6e9678e47cf5347872008661d5846">cJSON.cpp</a>

package/SVF-doxygen/html/html/globals_s.html

@@ -206,13 +206,13 @@ $(function() {
 : <a class="el" href="st_8h.html#ab10245506c3e5d053c75a902ec62a074">st.h</a>
 , <a class="el" href="st_8c.html#a958c280b8f24c847ca511eaffd410f04">st.c</a>
 </li>
+<li>ST_NUMCMP
+: <a class="el" href="st_8c.html#a2796b8bc2a5f15834d61a3519ad149d5">st.c</a>
+</li>
 <li>st_numcmp()
 : <a class="el" href="st_8h.html#a65b35768bcf5b6f173b063b441a493db">st.h</a>
 , <a class="el" href="st_8c.html#a0ba60ae98aae8e6dd21bbe3b485bcfbe">st.c</a>
 </li>
-<li>ST_NUMCMP
-: <a class="el" href="st_8c.html#a2796b8bc2a5f15834d61a3519ad149d5">st.c</a>
-</li>
 <li>st_numhash()
 : <a class="el" href="st_8h.html#a487317ef8c55ab34fb58ddfe47163b9e">st.h</a>
 , <a class="el" href="st_8c.html#aede320ef4713f295a335b4da6e1d8358">st.c</a>
@@ -289,12 +289,12 @@ $(function() {
 <li>Storebar
 : <a class="el" href="CFLGrammar_8txt.html#a324fa20755f4b8f2e50e2e148f6fadbd">CFLGrammar.txt</a>
 </li>
-<li>storedd
-: <a class="el" href="cuddInt_8c.html#a8ed518c7fe7ea969bd6981b71c37ec07">cuddInt.c</a>
-</li>
 <li>STOREDD
 : <a class="el" href="cuddInt_8c.html#ad90b4208ba9aa22e8f37b1ce723cdcf5">cuddInt.c</a>
 </li>
+<li>storedd
+: <a class="el" href="cuddInt_8c.html#a8ed518c7fe7ea969bd6981b71c37ec07">cuddInt.c</a>
+</li>
 <li>strcat()
 : <a class="el" href="util_8h.html#ae726f8c6b65e180aacfb570a35dc8375">util.h</a>
 </li>

package/SVF-doxygen/html/html/search/all_13.js

@@ -53,7 +53,7 @@ var searchData=
   ['selfcycle',['SelfCycle',['../classSVF_1_1Options.html#a3ed96242ac56a05d057ebd11b23cf053',1,'SVF::Options']]],
   ['sentinel',['sentinel',['../structDdManager.html#a8679aac5ecef09b42b3cf11786d57139',1,'DdManager']]],
   ['seq',['SEQ',['../classSVF_1_1NodeIDAllocator.html#a8cf553cd07768aad3f3b91bf3d7c6228a85142db6ed24203f054117f3a5110e2f',1,'SVF::NodeIDAllocator']]],
-  ['set',['set',['../classSVF_1_1CondStdSet.html#ae11deddad534be115d29daad08c90599',1,'SVF::CondStdSet::set()'],['../classSVF_1_1CondPointsToSet.html#aadf2576b55bbdb82d7affc8466c09861',1,'SVF::CondPointsToSet::set()'],['../classSVF_1_1PointsTo.html#ab196d86cfb48d1c5d27a0c03c7497afa',1,'SVF::PointsTo::set()'],['../classSVF_1_1CoreBitVector.html#a553e3e51bffe1aab04adc047e0fd3f24',1,'SVF::CoreBitVector::set()'],['../lib_2CUDD_2CMakeLists_8txt.html#a97d8d30dc013aa2acba4c146fdcb1acf',1,'set(SOURCES epd.c st.c util.c mtr.c cuddInt.c) add_llvm_library(Cudd $: CMakeLists.txt'],['../tools_2WPA_2CMakeLists_8txt.html#ae7f9c126d87731a942268db0cad0ac75',1,'set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) if(DEFINED IN_SOURCE_BUILD) set(LLVM_LINK_COMPONENTS BitWriter Core IPO IrReader InstCombine Instrumentation Target Linker Analysis ScalarOpts Support Svf Cudd) add_llvm_tool(wpa wpa.cpp) else() add_executable(wpa wpa.cpp) target_link_libraries(wpa Svf Cudd $: CMakeLists.txt'],['../namespaceSVF.html#af739db846e47ba6b2fd15eaad31ab7fb',1,'SVF::Set()']]],
+  ['set',['set',['../classSVF_1_1CondStdSet.html#ae11deddad534be115d29daad08c90599',1,'SVF::CondStdSet::set()'],['../classSVF_1_1CondPointsToSet.html#aadf2576b55bbdb82d7affc8466c09861',1,'SVF::CondPointsToSet::set()'],['../classSVF_1_1PointsTo.html#ab196d86cfb48d1c5d27a0c03c7497afa',1,'SVF::PointsTo::set()'],['../classSVF_1_1CoreBitVector.html#a553e3e51bffe1aab04adc047e0fd3f24',1,'SVF::CoreBitVector::set()'],['../namespaceSVF.html#af739db846e47ba6b2fd15eaad31ab7fb',1,'SVF::Set()'],['../lib_2CUDD_2CMakeLists_8txt.html#a97d8d30dc013aa2acba4c146fdcb1acf',1,'set(SOURCES epd.c st.c util.c mtr.c cuddInt.c) add_llvm_library(Cudd $: CMakeLists.txt'],['../tools_2WPA_2CMakeLists_8txt.html#ae7f9c126d87731a942268db0cad0ac75',1,'set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) if(DEFINED IN_SOURCE_BUILD) set(LLVM_LINK_COMPONENTS BitWriter Core IPO IrReader InstCombine Instrumentation Target Linker Analysis ScalarOpts Support Svf Cudd) add_llvm_tool(wpa wpa.cpp) else() add_executable(wpa wpa.cpp) target_link_libraries(wpa Svf Cudd $: CMakeLists.txt']]],
   ['setactualindef',['setActualINDef',['../classSVF_1_1SVFGOPT.html#a490695ab536cd455c531fbdc57499cac',1,'SVF::SVFGOPT']]],
   ['setallreachable',['setAllReachable',['../classSVF_1_1ProgSlice.html#ae6102647fa4985142c293116516612cd',1,'SVF::ProgSlice']]],
   ['setattributekinds',['setAttributeKinds',['../classSVF_1_1GrammarBase.html#a1e1bf1e32bcd7c68ce789c2f9f6327c0',1,'SVF::GrammarBase']]],
@@ -248,7 +248,7 @@ var searchData=
   ['st_5fis_5fmember',['st_is_member',['../st_8h.html#a3e18b4a4f91b4188aa376a15ca372b9c',1,'st.h']]],
   ['st_5flookup',['st_lookup',['../st_8h.html#a0ed63fd0cb21b0a1fe502e84aa5563ef',1,'st_lookup(st_table *, void *, void *): st.c'],['../st_8c.html#a0664208425f99d5c88fe2a79c425756c',1,'st_lookup(st_table *table, void *key, void *value): st.c']]],
   ['st_5flookup_5fint',['st_lookup_int',['../st_8h.html#ab10245506c3e5d053c75a902ec62a074',1,'st_lookup_int(st_table *, void *, int *): st.c'],['../st_8c.html#a958c280b8f24c847ca511eaffd410f04',1,'st_lookup_int(st_table *table, void *key, int *value): st.c']]],
-  ['st_5fnumcmp',['st_numcmp',['../st_8h.html#a65b35768bcf5b6f173b063b441a493db',1,'st_numcmp(const char *, const char *): st.c'],['../st_8c.html#a0ba60ae98aae8e6dd21bbe3b485bcfbe',1,'st_numcmp(const char *x, const char *y): st.c'],['../st_8c.html#a2796b8bc2a5f15834d61a3519ad149d5',1,'ST_NUMCMP(): st.c']]],
+  ['st_5fnumcmp',['ST_NUMCMP',['../st_8c.html#a2796b8bc2a5f15834d61a3519ad149d5',1,'ST_NUMCMP(): st.c'],['../st_8h.html#a65b35768bcf5b6f173b063b441a493db',1,'st_numcmp(const char *, const char *): st.c'],['../st_8c.html#a0ba60ae98aae8e6dd21bbe3b485bcfbe',1,'st_numcmp(const char *x, const char *y): st.c']]],
   ['st_5fnumhash',['st_numhash',['../st_8h.html#a487317ef8c55ab34fb58ddfe47163b9e',1,'st_numhash(char *, int): st.c'],['../st_8c.html#aede320ef4713f295a335b4da6e1d8358',1,'st_numhash(char *x, int size): st.c'],['../st_8c.html#a76573cced143d429f99bfb5e286c621e',1,'ST_NUMHASH(): st.c']]],
   ['st_5fout_5fof_5fmem',['ST_OUT_OF_MEM',['../st_8h.html#a1276d6ae80c20ae2ec082db7c502ef75',1,'st.h']]],
   ['st_5fpficpcp',['ST_PFICPCP',['../st_8h.html#afb91ce58b9010645ed1cdf1ed2b76b03',1,'st.h']]],
@@ -309,7 +309,7 @@ var searchData=
   ['storecgedge',['StoreCGEdge',['../classSVF_1_1StoreCGEdge.html',1,'SVF::StoreCGEdge'],['../classSVF_1_1StoreCGEdge.html#a667b277ef845b866d3b11a7fbfce0815',1,'SVF::StoreCGEdge::StoreCGEdge()'],['../classSVF_1_1StoreCGEdge.html#a0f873b0be0ac726e412171119c5b3a50',1,'SVF::StoreCGEdge::StoreCGEdge(const StoreCGEdge &)'],['../classSVF_1_1StoreCGEdge.html#afdba4e02b1ccdc19fdc18bbe43363e79',1,'SVF::StoreCGEdge::StoreCGEdge(ConstraintNode *s, ConstraintNode *d, EdgeID id)']]],
   ['storecgedgeset',['StoreCGEdgeSet',['../classSVF_1_1ConstraintGraph.html#a0f9d5eef25827ac1d380e5d8bd225025',1,'SVF::ConstraintGraph']]],
   ['storechi',['StoreCHI',['../classSVF_1_1StoreCHI.html',1,'SVF::StoreCHI< Cond >'],['../classSVF_1_1StoreCHI.html#a34433e6e437d302014fd06b5fb624a79',1,'SVF::StoreCHI::StoreCHI()'],['../classSVF_1_1SVFG.html#ad14cdbb3f1df1f716aa03b4d39f4e52b',1,'SVF::SVFG::STORECHI()'],['../classSVF_1_1MemSSA.html#a150e9d53ced1c143bba2d1026f739fa4',1,'SVF::MemSSA::STORECHI()']]],
-  ['storedd',['storedd',['../cuddInt_8c.html#a8ed518c7fe7ea969bd6981b71c37ec07',1,'storedd(): cuddInt.c'],['../cuddInt_8c.html#ad90b4208ba9aa22e8f37b1ce723cdcf5',1,'STOREDD(): cuddInt.c']]],
+  ['storedd',['STOREDD',['../cuddInt_8c.html#ad90b4208ba9aa22e8f37b1ce723cdcf5',1,'STOREDD(): cuddInt.c'],['../cuddInt_8c.html#a8ed518c7fe7ea969bd6981b71c37ec07',1,'storedd(): cuddInt.c']]],
   ['storedstnodes',['storeDstNodes',['../classSVF_1_1AliasDDAClient.html#aaad2197cec53f7eae91b3c57c168447a',1,'SVF::AliasDDAClient']]],
   ['storeedgelabelcounter',['storeEdgeLabelCounter',['../classSVF_1_1SVFStmt.html#a53b7e0d8666e37c23dc2c7d0fc931f27',1,'SVF::SVFStmt']]],
   ['storeedges',['StoreEdges',['../classSVF_1_1OfflineConsG.html#a9880cb387e24fa2c87297487411f95ea',1,'SVF::OfflineConsG']]],

package/SVF-doxygen/html/html/search/all_7.js

@@ -418,6 +418,7 @@ var searchData=
   ['getjoinedthread',['getJoinedThread',['../classSVF_1_1ForkJoinAnalysis.html#ada1e56dfe2d64ea6310142a346c86ed4',1,'SVF::ForkJoinAnalysis::getJoinedThread()'],['../classSVF_1_1ThreadAPI.html#ac9f3cc080275ce7d76dd2f56fc7c6434',1,'SVF::ThreadAPI::getJoinedThread(const Instruction *inst) const'],['../classSVF_1_1ThreadAPI.html#adf4350f4ef5a8d845806ab99591efa93',1,'SVF::ThreadAPI::getJoinedThread(CallSite cs) const']]],
   ['getjoinloop',['getJoinLoop',['../classSVF_1_1ForkJoinAnalysis.html#a3449439792a54c847c67b3041094db49',1,'SVF::ForkJoinAnalysis::getJoinLoop()'],['../classSVF_1_1TCT.html#a52a707bf6f278e810f440c279f5261dc',1,'SVF::TCT::getJoinLoop()']]],
   ['getjoinsites',['getJoinSites',['../classSVF_1_1ThreadCallGraph.html#aa8be8d48d680b3f2e61b2d8af5e9eddc',1,'SVF::ThreadCallGraph']]],
+  ['getjsonfile',['getJsonFile',['../ExtAPI_8cpp.html#a5e6188ceb5d9d599bd8f4ada2bd4e645',1,'ExtAPI.cpp']]],
   ['getkind',['getKind',['../classSVF_1_1CommonCHGraph.html#adf2a02fff9d7dd9fc9d92121e5e28f8b',1,'SVF::CommonCHGraph::getKind()'],['../classSVF_1_1PTACallGraph.html#ac6a294ec1c88862c8f7d54000f04e1f7',1,'SVF::PTACallGraph::getKind()'],['../classSVF_1_1VFG.html#ad63c3c11162ba107a6338fb24f9018d7',1,'SVF::VFG::getKind()'],['../classSVF_1_1SVFValue.html#a2ba3206a8461ef82713264e235128826',1,'SVF::SVFValue::getKind()']]],
   ['getkind2attrsmap',['getKind2AttrsMap',['../classSVF_1_1GrammarBase.html#ae28fea79c05ba05fc8c2e67b194e42b9',1,'SVF::GrammarBase::getKind2AttrsMap()'],['../classSVF_1_1CFLGraphBuilder.html#a61d935099e0f8408fb2f2f91001cb2fd',1,'SVF::CFLGraphBuilder::getKind2AttrsMap()']]],
   ['getkind2labelmap',['getKind2LabelMap',['../classSVF_1_1CFLGraphBuilder.html#ac8482350ceb21d626dcf1f30db737acd',1,'SVF::CFLGraphBuilder']]],
@@ -656,6 +657,7 @@ var searchData=
   ['getstartkind',['getStartKind',['../classSVF_1_1GrammarBase.html#a8921a7d7a006e31f13d88b8c808c931b',1,'SVF::GrammarBase::getStartKind()'],['../classSVF_1_1CFLGraph.html#a685fb852b2cd3767258225aa3b87caa4',1,'SVF::CFLGraph::getStartKind()']]],
   ['getstartroutineofcxtthread',['getStartRoutineOfCxtThread',['../classSVF_1_1TCT.html#a7ccacac1c673b38215b90e4eb480581f',1,'SVF::TCT']]],
   ['getstat',['getStat',['../classSVF_1_1SVFG.html#a8ba934714a7f2caf2e041002fdb66137',1,'SVF::SVFG::getStat()'],['../classSVF_1_1PointerAnalysis.html#a0ebf1138011aa526d92470c1931313ad',1,'SVF::PointerAnalysis::getStat()']]],
+  ['getstdoutfromcommand',['GetStdoutFromCommand',['../ExtAPI_8cpp.html#acf93365b9c9e5e35c979a671ee600409',1,'ExtAPI.cpp']]],
   ['getstmt',['getStmt',['../classSVF_1_1CxtStmt.html#a5e8c4b10eb5c3240d2e21a020ed834a6',1,'SVF::CxtStmt']]],
   ['getstmtreliance',['getStmtReliance',['../classSVF_1_1VersionedFlowSensitive.html#a3489def8e16e4d7c83d2c909d3287fc0',1,'SVF::VersionedFlowSensitive']]],
   ['getstmtvfgnode',['getStmtVFGNode',['../classSVF_1_1VFG.html#a32b1586d326fbe47080bd1fa2d3270e6',1,'SVF::VFG']]],

package/SVF-doxygen/html/html/search/functions_6.js

@@ -356,6 +356,7 @@ var searchData=
   ['getjoinedthread',['getJoinedThread',['../classSVF_1_1ForkJoinAnalysis.html#ada1e56dfe2d64ea6310142a346c86ed4',1,'SVF::ForkJoinAnalysis::getJoinedThread()'],['../classSVF_1_1ThreadAPI.html#ac9f3cc080275ce7d76dd2f56fc7c6434',1,'SVF::ThreadAPI::getJoinedThread(const Instruction *inst) const'],['../classSVF_1_1ThreadAPI.html#adf4350f4ef5a8d845806ab99591efa93',1,'SVF::ThreadAPI::getJoinedThread(CallSite cs) const']]],
   ['getjoinloop',['getJoinLoop',['../classSVF_1_1ForkJoinAnalysis.html#a3449439792a54c847c67b3041094db49',1,'SVF::ForkJoinAnalysis::getJoinLoop()'],['../classSVF_1_1TCT.html#a52a707bf6f278e810f440c279f5261dc',1,'SVF::TCT::getJoinLoop()']]],
   ['getjoinsites',['getJoinSites',['../classSVF_1_1ThreadCallGraph.html#aa8be8d48d680b3f2e61b2d8af5e9eddc',1,'SVF::ThreadCallGraph']]],
+  ['getjsonfile',['getJsonFile',['../ExtAPI_8cpp.html#a5e6188ceb5d9d599bd8f4ada2bd4e645',1,'ExtAPI.cpp']]],
   ['getkind',['getKind',['../classSVF_1_1CommonCHGraph.html#adf2a02fff9d7dd9fc9d92121e5e28f8b',1,'SVF::CommonCHGraph::getKind()'],['../classSVF_1_1PTACallGraph.html#ac6a294ec1c88862c8f7d54000f04e1f7',1,'SVF::PTACallGraph::getKind()'],['../classSVF_1_1VFG.html#ad63c3c11162ba107a6338fb24f9018d7',1,'SVF::VFG::getKind()'],['../classSVF_1_1SVFValue.html#a2ba3206a8461ef82713264e235128826',1,'SVF::SVFValue::getKind()']]],
   ['getkind2attrsmap',['getKind2AttrsMap',['../classSVF_1_1GrammarBase.html#ae28fea79c05ba05fc8c2e67b194e42b9',1,'SVF::GrammarBase::getKind2AttrsMap()'],['../classSVF_1_1CFLGraphBuilder.html#a61d935099e0f8408fb2f2f91001cb2fd',1,'SVF::CFLGraphBuilder::getKind2AttrsMap()']]],
   ['getkind2labelmap',['getKind2LabelMap',['../classSVF_1_1CFLGraphBuilder.html#ac8482350ceb21d626dcf1f30db737acd',1,'SVF::CFLGraphBuilder']]],
@@ -594,6 +595,7 @@ var searchData=
   ['getstartkind',['getStartKind',['../classSVF_1_1GrammarBase.html#a8921a7d7a006e31f13d88b8c808c931b',1,'SVF::GrammarBase::getStartKind()'],['../classSVF_1_1CFLGraph.html#a685fb852b2cd3767258225aa3b87caa4',1,'SVF::CFLGraph::getStartKind()']]],
   ['getstartroutineofcxtthread',['getStartRoutineOfCxtThread',['../classSVF_1_1TCT.html#a7ccacac1c673b38215b90e4eb480581f',1,'SVF::TCT']]],
   ['getstat',['getStat',['../classSVF_1_1SVFG.html#a8ba934714a7f2caf2e041002fdb66137',1,'SVF::SVFG::getStat()'],['../classSVF_1_1PointerAnalysis.html#a0ebf1138011aa526d92470c1931313ad',1,'SVF::PointerAnalysis::getStat()']]],
+  ['getstdoutfromcommand',['GetStdoutFromCommand',['../ExtAPI_8cpp.html#acf93365b9c9e5e35c979a671ee600409',1,'ExtAPI.cpp']]],
   ['getstmt',['getStmt',['../classSVF_1_1CxtStmt.html#a5e8c4b10eb5c3240d2e21a020ed834a6',1,'SVF::CxtStmt']]],
   ['getstmtreliance',['getStmtReliance',['../classSVF_1_1VersionedFlowSensitive.html#a3489def8e16e4d7c83d2c909d3287fc0',1,'SVF::VersionedFlowSensitive']]],
   ['getstmtvfgnode',['getStmtVFGNode',['../classSVF_1_1VFG.html#a32b1586d326fbe47080bd1fa2d3270e6',1,'SVF::VFG']]],

package/lib/CFL/CFGNormalizer.cpp

@@ -96,10 +96,11 @@ void CFGNormalizer::ebnf_bin(CFLGrammar *grammar)
         }
     }
 
-    auto &rawProductions = grammar->getRawProductions();
+    auto rawProductions = grammar->getRawProductions();
 
-    for(auto head : rawProductions)
+    for(auto itr : rawProductions)
     {
+        auto head = *(grammar->getRawProductions().find(itr.first));
         for(auto rule: head.second)
         {
             if (rule.size() < 3) continue;
@@ -203,20 +204,17 @@ void CFGNormalizer::ebnf_bin(CFLGrammar *grammar)
                     RHX = tempSym;
                 }
             }
-
-
-            for (auto new_head : new_grammar)
+        }
+    }
+    for (auto new_head : new_grammar)
+    {
+        for (auto prod : new_head.second)
+        {
+            auto it = grammar->getRawProductions()[new_head.first].find(prod);
+            if (it == grammar->getRawProductions()[new_head.first].end())
             {
-                for (auto prod : new_head.second)
-                {
-                    auto it = grammar->getRawProductions()[new_head.first].find(prod);
-                    if (it == grammar->getRawProductions()[new_head.first].end())
-                    {
-                        grammar->getRawProductions()[new_head.first].insert(prod);
-                    }
-                }
+                grammar->getRawProductions()[new_head.first].insert(prod);
             }
-
         }
     }
 }

package/lib/Util/ExtAPI.cpp

@@ -69,12 +69,64 @@ std::string ExtAPI::get_name(const SVFFunction *F)
     return funName;
 }
 
+// Get environment variables $SVF_DIR and "npm root" through popen() method
+std::string GetStdoutFromCommand(std::string command)
+{
+    char buffer[128];
+    std::string result = "";
+    // Open pipe to file
+    FILE *pipe = popen(command.c_str(), "r");
+    if (!pipe)
+    {
+        return "popen failed!";
+    }
+    // read till end of process:
+    while (!feof(pipe))
+    {
+        // use buffer to read and add to result
+        if (fgets(buffer, 128, pipe) != NULL)
+            result += buffer;
+    }
+    pclose(pipe);
+    // remove "\n"
+    result.erase(remove(result.begin(), result.end(), '\n'), result.end());
+    return result;
+}
+
+// Get ExtAPI.json file
+FILE *getJsonFile(std::string path)
+{
+    std::string jsonFilePath = GetStdoutFromCommand(path);
+    if (path.compare("npm root") == 0)
+    {
+        int os_flag = 1;
+        // SVF installed via npm needs to determine the type of operating system, otherwise the ExtAPI.json path may not be found
+        // Linux os
+#ifdef linux
+        os_flag = 0;
+        jsonFilePath.append("/svf-lib/SVF-linux");
+#endif
+        // Mac os
+        if (os_flag == 1)
+        {
+            jsonFilePath.append("/svf-lib/SVF-osx");
+        }
+    }
+    jsonFilePath.append(EXTAPI_JSON_PATH);
+    FILE *file = nullptr;
+    file = fopen(jsonFilePath.c_str(), "r");
+    return file;
+}
+
 // Get specifications of external functions in ExtAPI.json file
 cJSON *ExtAPI::get_FunJson(const std::string funName)
 {
-
-    if(!root)
+    if (!root)
     {
+        // Three ways to get ExtAPI.json path
+        // 1. default path(get ExtAPI.json path from Util/config.h)
+        // 2. from $SVF_DIR
+        // 3. from "npm root"(If SVF is installed via npm)
         std::string jsonFilePath = PROJECT_PATH;
         jsonFilePath.append(EXTAPI_JSON_PATH);
         // open file
@@ -82,8 +134,16 @@ cJSON *ExtAPI::get_FunJson(const std::string funName)
         file = fopen(jsonFilePath.c_str(), "r");
         if (file == nullptr)
         {
-            assert("Open Json file fails!");
-            return nullptr;
+            file = getJsonFile("$SVF_DIR");
+            if (file == nullptr)
+            {
+                file = getJsonFile("npm root");
+                if (file == nullptr)
+                {
+                    assert(false && "Open ExtAPI.json file fails!");
+                    return nullptr;
+                }
+            }
         }
         // get file size
         struct stat statbuf;
@@ -98,7 +158,7 @@ cJSON *ExtAPI::get_FunJson(const std::string funName)
         u32_t size = fread(jsonStr, sizeof(char), fileSize, file);
         if (size == 0)
         {
-            assert("read Json file fails!");
+            assert(false && "Read ExtAPI.json file fails!");
             return nullptr;
         }
         fclose(file);
@@ -276,5 +336,3 @@ bool ExtAPI::is_ext(const SVFFunction *F)
     }
     return res;
 }
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.486",
+  "version": "1.0.489",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {