Finished integrated a rough API into srcSlice and began writing a tes…

…t for it. Doesn't test anything yet but... soon.
srcML · Nov 1, 2015 · 8036151 · 8036151
1 parent 996caaa
commit 8036151
Show file tree

Hide file tree

Showing 11 changed files with 537 additions and 382 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,8 @@
 
 cmake_minimum_required(VERSION 2.8)
 project(srcSlice)
-
+set(CMAKE_CXX_COMPILER "c++")
+set(CMAKE_CXX_FLAGS "-std=c++0x -O3")
 enable_testing()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,6 +1,13 @@
 file(GLOB SRCSLICEHANDLER_SOURCE cpp/*.cpp)
+file(GLOB SRCSLICEHANDLER_SOURCE2 cpp/srcSlice*.cpp)
 file(GLOB SRCSLICEHANDLER_INCLUDE headers/*.hpp)
+file(GLOB SRCSLICETEST_SOURCE tests/*.cpp)
+file(GLOB SRCSLICETEST_INCLUDE tests/*.hpp)
+
+link_directories(/usr/local/lib/)
 
 add_executable(srcSlice ${SRCSLICEHANDLER_SOURCE} ${SRCSLICEHANDLER_INCLUDE})
+add_executable(srcslicetest ${SRCSLICEHANDLER_SOURCE2} ${SRCSLICEHANDLER_INCLUDE} ${SRCSLICETEST_SOURCE} ${SRCSLICETEST_INCLUDE})
 
-target_link_libraries(srcSlice srcsax ${LIBXML2_LIBRARIES})
+target_link_libraries(srcSlice srcsax ${LIBXML2_LIBRARIES})
+target_link_libraries(srcslicetest srcsax srcml ${LIBXML2_LIBRARIES})
diff --git a/src/cpp/output.cpp b/src/cpp/output.cpp
@@ -0,0 +1,189 @@
+/**
+ * @file srcSlice.cpp
+ *
+ * @copyright Copyright (C) 2013-2014  SDML (www.srcML.org)
+ *
+ * The srcML Toolkit is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The srcML Toolkit is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the srcML Toolkit; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <srcSliceHandler.hpp>
+#include <srcSAXController.hpp>
+#include <time.h> 
+#include <map>
+#include <iostream>
+
+void TestSlice2(const VarMap& mp){
+	for(VarMap::const_iterator vmIt = mp.begin(); vmIt != mp.end(); ++vmIt){
+		std::cerr<<"-------------------------"<<std::endl;
+		std::cerr<<"Variable: "<<vmIt->first<<std::endl;
+		std::cerr<<"Slines: {";
+		for(unsigned int sl : vmIt->second.slines){
+			std::cerr<<sl<<",";
+		}
+		std::cerr<<"}"<<std::endl;
+		std::cerr<<"dvars: {";
+		for(std::string dv : vmIt->second.dvars){
+			std::cerr<<dv<<",";
+		}
+		std::cerr<<"}"<<std::endl;
+		std::cerr<<"is aliase for: {";
+		for(std::string al : vmIt->second.aliases){
+			std::cerr<<al<<",";
+		}
+		std::cerr<<"}"<<std::endl;
+		std::cerr<<"cfuntions: {";
+		for(auto cfunc : vmIt->second.cfunctions){
+			std::cerr<<cfunc.first<<" "<<cfunc.second<<",";
+		}
+		std::cerr<<"}"<<std::endl;
+		std::cerr<<"-------------------------"<<std::endl;
+	}
+}
+void TestSlice(const FileFunctionVarMap& mp, srcSliceHandler handler){
+	for(FileFunctionVarMap::const_iterator ffvmIt = mp.begin(); ffvmIt != mp.end(); ++ffvmIt){
+		std::cerr<<"FILE: "<<ffvmIt->first<<std::endl;
+        for(FunctionVarMap::const_iterator fvmIt = ffvmIt->second.begin(); fvmIt != ffvmIt->second.end(); ++fvmIt){
+			std::cerr<<fvmIt->first<<std::endl;
+			//std::cerr<<handler.sysDict->functionTable.find(fvmIt->first)->second<<std::endl; 
+			for(VarMap::const_iterator vmIt = fvmIt->second.begin(); vmIt != fvmIt->second.end(); ++vmIt){
+				std::cerr<<"-------------------------"<<std::endl;
+				std::cerr<<"Variable: "<<vmIt->first<<std::endl;
+				std::cerr<<"Slines: {";
+				for(unsigned int sl : vmIt->second.slines){
+					std::cerr<<sl<<",";
+				}
+				std::cerr<<"}"<<std::endl;
+				std::cerr<<"variables dependant on this one: {";
+				for(std::string dv : vmIt->second.dvars){
+					std::cerr<<dv<<",";
+				}
+				std::cerr<<"}"<<std::endl;
+				std::cerr<<"is aliase for: {";
+				for(std::string al : vmIt->second.aliases){
+					std::cerr<<al<<",";
+				}
+				std::cerr<<"}"<<std::endl;
+				std::cerr<<"cfuntions: {";
+				for(auto cfunc : vmIt->second.cfunctions){
+						std::cerr<<cfunc.first<<" "<<cfunc.second<<",";
+				}
+				std::cerr<<"}"<<std::endl;
+				std::cerr<<"def: {";
+				for(auto defv : vmIt->second.def){
+					std::cerr<<defv<<",";
+				}
+				std::cerr<<"}"<<std::endl;
+				std::cerr<<"use: {";
+				for(auto usev : vmIt->second.use){
+					std::cerr<<usev<<",";
+				}
+				std::cerr<<"}"<<std::endl;
+				std::cerr<<"-------------------------"<<std::endl;
+			}
+		}
+	}
+}
+
+void srcSliceToCsv(const srcSlice& handler){
+	std::string str;
+	for(FileFunctionVarMap::const_iterator ffvmIt = handler.dictionary.ffvMap.begin(); ffvmIt != handler.dictionary.ffvMap.end(); ++ffvmIt){
+		//auto fileNameIt = handler.dictionary.fileTable.find(ffvmIt->first);
+		//if(fileNameIt != handler.dictionary.fileTable.end())
+		for(FunctionVarMap::const_iterator fvmIt = ffvmIt->second.begin(); fvmIt != ffvmIt->second.end(); ++fvmIt){
+			//auto functionNameIt = handler.dictionary.functionTable.find();
+			for(VarMap::const_iterator vmIt = fvmIt->second.begin(); vmIt != fvmIt->second.end(); ++vmIt){
+				str.append(ffvmIt->first).append(",").append(fvmIt->first).append(",").append(vmIt->first);
+				str.append(",def{");
+				for(unsigned int def : vmIt->second.def){
+            		std::stringstream ststrm;
+            		ststrm<<def;
+					str.append(ststrm.str()).append(",");
+				}
+				if(str.at(str.length()-1) == ',')
+					str.erase(str.length()-1);
+				str.append("},");
+                str.append("use{");
+                for(unsigned int use : vmIt->second.use){
+                    std::stringstream ststrm;
+                    ststrm<<use;
+                    str.append(ststrm.str()).append(",");
+                }
+                if(str.at(str.length()-1) == ',')
+                    str.erase(str.length()-1);
+                str.append("},");
+				str.append("dvars{");
+				for(std::string dv : vmIt->second.dvars){
+					str.append(dv.append(","));
+				}
+				if(str.at(str.length()-1) == ',')
+					str.erase(str.length()-1);
+				str.append("},");
+				str.append("pointers{");
+				for(std::string al : vmIt->second.aliases){
+					str.append(al.append(","));
+				}
+				if(str.at(str.length()-1) == ',')
+					str.erase(str.length()-1);
+				str.append("},");
+				str.append("cfuncs{");
+				for(auto cfunc : vmIt->second.cfunctions){
+            			std::stringstream ststrm;
+            			ststrm<<cfunc.second;
+						str.append(cfunc.first).append("{").append(ststrm.str()).append("},");
+				}
+				if(str.at(str.length()-1) == ',')
+					str.erase(str.length()-1);
+				str.append("}");
+				std::cout<<str<<std::endl;
+				str.clear();
+			}
+		}
+	}
+}
+/**
+ * main
+ * @param argc number of arguments
+ * @param argv the provided arguments (array of C strings)
+ * 
+ * Invoke srcSAX handler to count element occurences and print out the resulting element counts.
+ */
+/*
+  Type Resolution tool
+  Def Use Tool as separate thing (same as type res?)
+  methods
+  statement #
+  Consider output to srcML
+  */
+int main(int argc, char * argv[]) {
+
+  if(argc < 2) {
+
+    std::cerr << "Useage: srcSlice input_file.xml\n";
+    exit(1);
+
+  }
+  //clock_t t;
+  //t = clock();
+  srcSlice sslice;
+  sslice.ReadArchiveFile("srcslicetest.cpp.xml");
+  //t = clock() - t;
+  //std::cerr<<"Time is: "<<((float)t)/CLOCKS_PER_SEC<<std::endl;
+  //std::string filename = handler.sysDict->find("stack.cpp.xml");
+  //handler.ComputeInterprocedural("SlicerTestSample.cpp");
+  //TestSlice(handler.sysDict-> handler);
+  //TestSlice2(handler.sysDict->globalMap);
+  srcSliceToCsv(sslice);
+  return 0;
+}