trivial case for local variables only

.gitignore

@@ -1,25 +1,25 @@
 # Add any directories, files, or patterns you don't want to be tracked by version control
 *.o
-Sapfor/.idea/
+sapfor/experts/Sapfor_2017/.idea/
-Sapfor/cmake-build-debug/
+sapfor/experts/Sapfor_2017/cmake-build-debug/
-Sapfor/.vs/
+sapfor/experts/Sapfor_2017/.vs/
-Sapfor/_bin/
+sapfor/experts/Sapfor_2017/_bin/
-Sapfor/_lib/
+sapfor/experts/Sapfor_2017/_lib/
-Sapfor/Inliner/x64/
+sapfor/experts/Sapfor_2017/Inliner/x64/
-Sapfor/Parser/x64/
+sapfor/experts/Sapfor_2017/Parser/x64/
-Sapfor/SageLib/x64/
+sapfor/experts/Sapfor_2017/SageLib/x64/
-Sapfor/SageNewSrc/x64/
+sapfor/experts/Sapfor_2017/SageNewSrc/x64/
-Sapfor/SageOldSrc/x64/
+sapfor/experts/Sapfor_2017/SageOldSrc/x64/
-Sapfor/Sapfor/x64/
+sapfor/experts/Sapfor_2017/Sapfor/x64/
-Sapfor/TransformCommonLib/x64/
+sapfor/experts/Sapfor_2017/TransformCommonLib/x64/
-Sapfor/TransformLib/x64/
+sapfor/experts/Sapfor_2017/TransformLib/x64/
-Sapfor/TransformUtils/x64/
+sapfor/experts/Sapfor_2017/TransformUtils/x64/
 dvm/fdvm/trunk/.svn/
-Sapfor/.svn/
+sapfor/experts/Sapfor_2017/.svn/
 sapfor/transformers
 sapfor/transformers/.svn/
-Sapfor/_src/boost
+sapfor/experts/Sapfor_2017/_src/boost
-Sapfor/Sapfor/Sapfor.vcxproj.user
+sapfor/experts/Sapfor_2017/Sapfor/Sapfor.vcxproj.user
 sapfor/analyzers/
 sapfor/general/
 sapfor/generators/
@@ -30,11 +30,11 @@ sapfor/experts/expert_maxim_last_version/
 sapfor/experts/visualizer/
 sapfor/.svn/
 
-Sapfor/cmake-build-debug/
+sapfor/experts/Sapfor_2017/cmake-build-debug/
-Sapfor/build/
+sapfor/experts/Sapfor_2017/build/
-Sapfor/Inliner/build/
+sapfor/experts/Sapfor_2017/Inliner/build/
-Sapfor/Parser/build/
+sapfor/experts/Sapfor_2017/Parser/build/
-Sapfor/Sapfor/*.o
+sapfor/experts/Sapfor_2017/Sapfor/*.o
 sapfor/transformers/ftransform/trunk/cmake-build-debug/
 sapfor/transformers/ftransform/trunk/build/
 sapfor/transformers/ftransform/trunk/parser/build/
@@ -57,23 +57,22 @@ dvm/tools/omp-pa/
 dvm/CMakeLists.txt
 dvm/.svn/
 dvm/fdvm/branches/
-Sapfor/TransformCommonLib/TransformCommonLib.vcxproj.user
+sapfor/experts/Sapfor_2017/TransformCommonLib/TransformCommonLib.vcxproj.user
-Sapfor/SageOldSrc/SageOldSrc.vcxproj.user
+sapfor/experts/Sapfor_2017/SageOldSrc/SageOldSrc.vcxproj.user
-Sapfor/SageNewSrc/SageNewSrc.vcxproj.user
+sapfor/experts/Sapfor_2017/SageNewSrc/SageNewSrc.vcxproj.user
-Sapfor/SageLib/SageLib.vcxproj.user
+sapfor/experts/Sapfor_2017/SageLib/SageLib.vcxproj.user
-Sapfor/Inliner/Inliner.vcxproj.user
+sapfor/experts/Sapfor_2017/Inliner/Inliner.vcxproj.user
-Sapfor/TransformUtils/TransformUtils.vcxproj.user
+sapfor/experts/Sapfor_2017/TransformUtils/TransformUtils.vcxproj.user
-Sapfor/Parser/Parser.vcxproj.user
+sapfor/experts/Sapfor_2017/Parser/Parser.vcxproj.user
 .vscode/*
 .vs/
 **/**/.DS_Store
-Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.user
+sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.user
-Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.filters
+sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.filters
-Sapfor/Sapc++/Sapc++/Sapc++.vcxproj
+sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj
-Sapfor/Sapc++/Sapc++/x64/
+sapfor/experts/Sapfor_2017/Sapc++/Sapc++/x64/
-Sapfor/Sapc++/x64/
+sapfor/experts/Sapfor_2017/Sapc++/x64/
 
 /build
 
-Sapfor/out/
+sapfor/experts/Sapfor_2017/out/
-Sapfor/_bin/*

CMakeLists.txt

@@ -1,523 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-set(project Sapfor)
-if (TARGET ${project})
-    return()
-endif ()
-project(${project})
-message("processing ${project}")
-#include(CTest)
-
-add_definitions("-D SYS5")
-add_definitions("-D YYDEBUG")
-
-set(CMAKE_CXX_STANDARD 17)
-
-set(fdvm_include projects/dvm/fdvm/trunk/include)
-set(fdvm_sources projects//dvm/fdvm/trunk/fdvm/)
-set(sage_include_1 projects/dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 projects/dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources projects/dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources projects/dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources projects/dvm/fdvm/trunk/parser)
-set(pppa_sources projects/dvm/tools/pppa/trunk/src)
-set(zlib_sources projects/dvm/tools/Zlib)
-
-# Read pathes to external sapfor directories
-#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/projects/paths.txt")
-#    message("Found paths.txt, using custom paths.")
-#    FILE(STRINGS ./projects/paths.txt SAPFOR_PATHS)
-#else ()
-#    message("Not found paths.txt, using default paths.")
-#    FILE(STRINGS ./projects/paths.default.txt SAPFOR_PATHS)
-#endif ()
-  
-foreach (NameAndValue ${SAPFOR_PATHS})
-    # Strip leading spaces
-    string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
-    # Find variable name
-    string(REGEX MATCH "^[^=]+" Name ${NameAndValue})
-    # Find the value
-    string(REPLACE "${Name}=" "" Value ${NameAndValue})
-    # Set the variable, note the ../ because we are deeper than the file
-    set(${Name} "${Value}")
-    message("Using ${Name} ${${Name}}")
-endforeach ()
-
-include_directories(src)
-#Sage lib includes
-include_directories(${fdvm_include})
-include_directories(${sage_include_1})
-include_directories(${sage_include_2})
-#Zlib includes
-include_directories(${zlib_sources}/include)
-#PPPA includes
-include_directories(${pppa_sources})
-
-set(PR_PARAM src/ProjectParameters/projectParameters.cpp
-             src/ProjectParameters/projectParameters.h)
-
-set(GR_LAYOUT src/VisualizerCalls/graphLayout/algebra.cpp
-        src/VisualizerCalls/graphLayout/algebra.hpp
-        src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
-        src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
-        src/VisualizerCalls/graphLayout/kamada_kawai.cpp
-        src/VisualizerCalls/graphLayout/kamada_kawai.hpp
-        src/VisualizerCalls/graphLayout/layout.cpp
-        src/VisualizerCalls/graphLayout/layout.hpp
-        src/VisualizerCalls/graphLayout/nodesoup.cpp
-        src/VisualizerCalls/graphLayout/nodesoup.hpp)
-    
-set(VS_CALLS src/VisualizerCalls/get_information.cpp
-        src/VisualizerCalls/get_information.h
-        src/VisualizerCalls/SendMessage.cpp
-        src/VisualizerCalls/SendMessage.h
-        src/VisualizerCalls/BuildGraph.cpp
-        src/VisualizerCalls/BuildGraph.h)
-    
-set(VERIF src/VerificationCode/CorrectVarDecl.cpp
-        src/VerificationCode/IncludeChecker.cpp
-        src/VerificationCode/StructureChecker.cpp
-        src/VerificationCode/VerifySageStructures.cpp
-        src/VerificationCode/verifications.h)
-
-set(UTILS src/Utils/AstWrapper.h
-        src/Utils/BoostStackTrace.cpp
-        src/Utils/CommonBlock.h
-        src/Utils/DefUseList.h
-        src/Utils/errors.h
-        src/Utils/leak_detector.h
-        src/Utils/RationalNum.cpp
-        src/Utils/RationalNum.h
-        src/Utils/SgUtils.cpp
-        src/Utils/SgUtils.h
-        src/Utils/types.h
-        src/Utils/utils.cpp
-        src/Utils/utils.h
-        src/Utils/version.h
-        src/Utils/module_utils.h
-        src/Utils/module_utils.cpp)
-        
-set(OMEGA src/SageAnalysisTool/OmegaForSage/add-assert.cpp
-        src/SageAnalysisTool/OmegaForSage/affine.cpp
-        src/SageAnalysisTool/OmegaForSage/cover.cpp
-        src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
-        src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
-        src/SageAnalysisTool/OmegaForSage/ddomega.cpp
-        src/SageAnalysisTool/OmegaForSage/debug.cpp
-        src/SageAnalysisTool/OmegaForSage/ip.cpp
-        src/SageAnalysisTool/OmegaForSage/kill.cpp
-        src/SageAnalysisTool/OmegaForSage/refine.cpp
-        src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
-        src/SageAnalysisTool/annotationDriver.cpp
-        src/SageAnalysisTool/arrayRef.cpp
-        src/SageAnalysisTool/computeInducVar.cpp
-        src/SageAnalysisTool/constanteProp.cpp
-        src/SageAnalysisTool/constanteSet.h
-        src/SageAnalysisTool/controlFlow.cpp
-        src/SageAnalysisTool/defUse.cpp
-        src/SageAnalysisTool/dependence.cpp
-        src/SageAnalysisTool/depGraph.cpp
-        src/SageAnalysisTool/depInterface.cpp
-        src/SageAnalysisTool/depInterfaceExt.h
-        src/SageAnalysisTool/flowAnalysis.cpp
-        src/SageAnalysisTool/inducVar.h
-        src/SageAnalysisTool/intrinsic.cpp
-        src/SageAnalysisTool/invariant.cpp
-        src/SageAnalysisTool/loopTransform.cpp
-        src/SageAnalysisTool/set.cpp)
-
-set(PRIV src/PrivateAnalyzer/private_analyzer.cpp
-        src/PrivateAnalyzer/private_analyzer.h)
-
-set(FDVM ${fdvm_sources}/acc.cpp
-         ${fdvm_sources}/acc_across.cpp
-         ${fdvm_sources}/acc_across_analyzer.cpp
-         ${fdvm_sources}/acc_analyzer.cpp
-         ${fdvm_sources}/acc_data.cpp
-         ${fdvm_sources}/acc_f2c.cpp
-         ${fdvm_sources}/acc_f2c_handlers.cpp
-         ${fdvm_sources}/acc_rtc.cpp
-         ${fdvm_sources}/acc_rtc.cpp
-         ${fdvm_sources}/acc_utilities.cpp
-         ${fdvm_sources}/aks_analyzeLoops.cpp
-         ${fdvm_sources}/aks_structs.cpp
-         ${fdvm_sources}/checkpoint.cpp
-         ${fdvm_sources}/debug.cpp
-         ${fdvm_sources}/dvm.cpp
-         ${fdvm_sources}/calls.cpp
-         ${fdvm_sources}/funcall.cpp
-         ${fdvm_sources}/help.cpp
-         ${fdvm_sources}/hpf.cpp
-         ${fdvm_sources}/io.cpp
-         ${fdvm_sources}/omp.cpp
-         ${fdvm_sources}/ompdebug.cpp
-         ${fdvm_sources}/parloop.cpp
-         ${fdvm_sources}/stmt.cpp)
-        
-set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp
-        src/ParallelizationRegions/ParRegions.h
-        src/ParallelizationRegions/ParRegions_func.h
-        src/ParallelizationRegions/expand_extract_reg.cpp
-        src/ParallelizationRegions/expand_extract_reg.h
-        src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
-        src/ParallelizationRegions/resolve_par_reg_conflicts.h)
-
-set(TR_DEAD_CODE src/Transformations/dead_code.cpp
-        src/Transformations/dead_code.h)
-set(TR_CP src/Transformations/checkpoints.cpp
-        src/Transformations/checkpoints.h)
-set(TR_VECTOR src/Transformations/array_assign_to_loop.cpp
-        src/Transformations/array_assign_to_loop.h)
-set(TR_ENDDO_LOOP src/Transformations/enddo_loop_converter.cpp
-        src/Transformations/enddo_loop_converter.h)
-set(TR_LOOP_NEST src/Transformations/loop_transform.cpp
-        src/Transformations/loop_transform.h)
-set(TR_LOOP_COMB src/Transformations/loops_combiner.cpp
-        src/Transformations/loops_combiner.h)
-set(TR_LOOP_SPLIT src/Transformations/loops_splitter.cpp
-        src/Transformations/loops_splitter.h)
-set(TR_LOOP_UNROLL src/Transformations/loops_unrolling.cpp
-        src/Transformations/loops_unrolling.h)     
-set(TR_PRIV_BR src/Transformations/private_arrays_resizing.cpp
-        src/Transformations/private_arrays_resizing.h)
-set(TR_PRIV_DEL src/Transformations/private_removing.cpp
-        src/Transformations/private_removing.h)
-set(TR_SWAP_ARR_DIMS src/Transformations/swap_array_dims.cpp
-        src/Transformations/swap_array_dims.h)
-set(TR_FUNC_DUP src/Transformations/uniq_call_chain_dup.cpp
-        src/Transformations/uniq_call_chain_dup.h)
-set(TR_FUNC_PURE src/Transformations/function_purifying.cpp
-        src/Transformations/function_purifying.h)  
-set(TR_GV src/Transformations/fix_common_blocks.cpp
-        src/Transformations/fix_common_blocks.h)
-set(TR_CONV src/Transformations/convert_to_c.cpp
-        src/Transformations/convert_to_c.h)
-set(TR_IMPLICIT_NONE src/Transformations/set_implicit_none.cpp
-        src/Transformations/set_implicit_none.h)
-set(TR_REPLACE_ARRAYS_IN_IO src/Transformations/replace_dist_arrays_in_io.cpp
-        src/Transformations/replace_dist_arrays_in_io.h)
-
-set(TRANSFORMS 
-        ${TR_DEAD_CODE}
-        ${TR_CP} 
-        ${TR_VECTOR}
-        ${TR_ENDDO_LOOP}
-        ${TR_LOOP_NEST}
-        ${TR_LOOP_COMB} 
-        ${TR_LOOP_SPLIT}
-        ${TR_PRIV_BR}
-        ${TR_SWAP_ARR_DIMS} 
-        ${TR_FUNC_DUP} 
-        ${TR_FUNC_PURE}
-        ${TR_LOOP_UNROLL}
-        ${TR_GV}
-        ${TR_PRIV_DEL}
-        ${TR_CONV}
-        ${TR_PRIV_DEL}
-        ${TR_IMPLICIT_NONE}
-        ${TR_REPLACE_ARRAYS_IN_IO})
-        
-set(CFG src/CFGraph/IR.cpp
-        src/CFGraph/IR.h
-        src/CFGraph/CFGraph.cpp
-        src/CFGraph/CFGraph.h
-        src/CFGraph/RD_subst.cpp
-        src/CFGraph/RD_subst.h
-        src/CFGraph/live_variable_analysis.cpp
-        src/CFGraph/live_variable_analysis.h
-        src/CFGraph/private_variables_analysis.cpp
-        src/CFGraph/private_variables_analysis.h
-        )
-        
-set(DATA_FLOW
-        src/CFGraph/DataFlow/data_flow.h
-        src/CFGraph/DataFlow/data_flow_impl.h
-        src/CFGraph/DataFlow/backward_data_flow.h
-        src/CFGraph/DataFlow/backward_data_flow_impl.h
-        )
-
-set(CREATE_INTER_T  src/CreateInterTree/CreateInterTree.cpp
-        src/CreateInterTree/CreateInterTree.h)
-
-set(DIRA  src/DirectiveProcessing/directive_analyzer.cpp
-        src/DirectiveProcessing/directive_analyzer.h
-        src/DirectiveProcessing/directive_creator.cpp
-        src/DirectiveProcessing/directive_creator_base.cpp
-        src/DirectiveProcessing/directive_creator.h
-        src/DirectiveProcessing/directive_parser.cpp
-        src/DirectiveProcessing/directive_parser.h
-        src/DirectiveProcessing/directive_omp_parser.cpp
-        src/DirectiveProcessing/directive_omp_parser.h
-        src/DirectiveProcessing/insert_directive.cpp
-        src/DirectiveProcessing/insert_directive.h
-        src/DirectiveProcessing/remote_access.cpp
-        src/DirectiveProcessing/remote_access_base.cpp
-        src/DirectiveProcessing/remote_access.h
-        src/DirectiveProcessing/shadow.cpp
-        src/DirectiveProcessing/shadow.h
-        src/DirectiveProcessing/spf_directive_preproc.cpp)
-        
-set(DISTR src/Distribution/Array.cpp
-        src/Distribution/ArrayAnalysis.cpp
-        src/Distribution/Array.h
-        src/Distribution/Arrays.h
-        src/Distribution/CreateDistributionDirs.cpp
-        src/Distribution/CreateDistributionDirs.h
-        src/Distribution/Cycle.cpp
-        src/Distribution/Cycle.h
-        src/Distribution/Distribution.cpp
-        src/Distribution/Distribution.h
-        src/Distribution/DvmhDirective.cpp
-        src/Distribution/DvmhDirective.h
-        src/Distribution/DvmhDirective_func.h
-        src/Distribution/DvmhDirectiveBase.cpp
-        src/Distribution/DvmhDirectiveBase.h
-        src/Distribution/GraphCSR.cpp
-        src/Distribution/GraphCSR.h)
-        
-set(DVMH_REG src/DvmhRegions/DvmhRegionInserter.cpp
-        src/DvmhRegions/DvmhRegionInserter.h
-        src/DvmhRegions/RegionsMerger.cpp
-        src/DvmhRegions/RegionsMerger.h
-        src/DvmhRegions/ReadWriteAnalyzer.cpp
-        src/DvmhRegions/ReadWriteAnalyzer.h
-        src/DvmhRegions/LoopChecker.cpp
-        src/DvmhRegions/LoopChecker.h
-        src/DvmhRegions/DvmhRegion.cpp
-        src/DvmhRegions/DvmhRegion.h
-        src/DvmhRegions/VarUsages.cpp
-        src/DvmhRegions/VarUsages.h
-        src/DvmhRegions/TypedSymbol.cpp
-        src/DvmhRegions/TypedSymbol.h)
-        
-set(DYNA src/DynamicAnalysis/createParallelRegions.cpp
-        src/DynamicAnalysis/createParallelRegions.h
-        src/DynamicAnalysis/gcov_info.cpp
-        src/DynamicAnalysis/gcov_info.h
-        src/DynamicAnalysis/gCov_parser.cpp
-        src/DynamicAnalysis/gCov_parser_func.h)
-
-set(EXPR_TRANSFORM src/ExpressionTransform/control_flow_graph_part.cpp
-        src/ExpressionTransform/expr_transform.cpp
-        src/ExpressionTransform/expr_transform.h)
-        
-set(GR_CALL src/GraphCall/graph_calls.cpp
-        src/GraphCall/graph_calls.h
-        src/GraphCall/graph_calls_base.cpp
-        src/GraphCall/graph_calls_func.h)
-        
-set(GR_LOOP src/GraphLoop/graph_loops_base.cpp
-        src/GraphLoop/graph_loops.cpp
-        src/GraphLoop/graph_loops.h
-        src/GraphLoop/graph_loops_func.h)
-        
-set(INLINER src/Inliner/inliner.cpp
-        src/Inliner/inliner.h)
-        
-set(LOOP_ANALYZER  src/LoopAnalyzer/allocations_prepoc.cpp
-        src/LoopAnalyzer/dep_analyzer.cpp        
-        src/LoopAnalyzer/loop_analyzer.cpp
-        src/LoopAnalyzer/loop_analyzer.h)
-
-set(RENAME_SYMBOLS  src/RenameSymbols/rename_symbols.cpp
-                    src/RenameSymbols/rename_symbols.h)
-
-
-set(MAIN src/Sapfor.cpp
-        src/Sapfor.h
-        src/SapforData.h
-        src/Utils/PassManager.h)
-
-set(PREDICTOR src/Predictor/PredictScheme.cpp
-              src/Predictor/PredictScheme.h)
-
-set(PROJ_MAN src/ProjectManipulation/ParseFiles.cpp
-             src/ProjectManipulation/ParseFiles.h
-             src/ProjectManipulation/StdCapture.h
-             src/ProjectManipulation/PerfAnalyzer.cpp
-             src/ProjectManipulation/PerfAnalyzer.h
-             src/ProjectManipulation/FileInfo.cpp
-             src/ProjectManipulation/FileInfo.h
-             src/ProjectManipulation/ConvertFiles.cpp
-             src/ProjectManipulation/ConvertFiles.h)
-
-set(PARSER  ${parser_sources}/cftn.c
-            ${parser_sources}/errors.c
-            ${parser_sources}/gram1.tab.c
-            ${parser_sources}/hash.c
-            ${parser_sources}/init.c
-            ${parser_sources}/lexfdvm.c
-            ${parser_sources}/lists.c
-            ${parser_sources}/low_hpf.c
-            ${parser_sources}/misc.c
-            ${parser_sources}/stat.c
-            ${parser_sources}/sym.c
-            ${parser_sources}/types.c
-            ${parser_sources}/unparse_hpf.c)
-
-set(PPPA    ${pppa_sources}/inter.cpp
-            ${pppa_sources}/potensyn.cpp
-            ${pppa_sources}/stat.cpp
-            ${pppa_sources}/statfile.cpp
-            ${pppa_sources}/statinter.cpp
-            ${pppa_sources}/statlist.cpp
-            ${pppa_sources}/statprintf.cpp
-            ${pppa_sources}/statread.cpp
-            ${pppa_sources}/treeinter.cpp  
-            
-            ${pppa_sources}/bool.h
-            ${pppa_sources}/dvmh_stat.h
-            ${pppa_sources}/inter.h
-            ${pppa_sources}/potensyn.h
-            ${pppa_sources}/statist.h
-            ${pppa_sources}/statlist.h
-            ${pppa_sources}/statprintf.h
-            ${pppa_sources}/statread.h
-            ${pppa_sources}/strall.h
-            ${pppa_sources}/sysstat.h
-            ${pppa_sources}/treeinter.h
-            ${pppa_sources}/ver.h
-            ${pppa_sources}/statinter.h
-            ${pppa_sources}/json.hpp)
-            
-set(ZLIB    ${zlib_sources}/src/adler32.c
-            ${zlib_sources}/src/compress.c
-            ${zlib_sources}/src/crc32.c
-            ${zlib_sources}/src/deflate.c
-            ${zlib_sources}/src/gzio.c
-            ${zlib_sources}/src/infblock.c
-            ${zlib_sources}/src/infcodes.c
-            ${zlib_sources}/src/inffast.c
-            ${zlib_sources}/src/inflate.c
-            ${zlib_sources}/src/inftrees.c
-            ${zlib_sources}/src/infutil.c
-            ${zlib_sources}/src/trees.c
-            ${zlib_sources}/src/uncompr.c
-            ${zlib_sources}/src/zutil.c)
-
-set(SOURCE_EXE      
-    ${CFG}
-    ${DATA_FLOW}
-    ${CREATE_INTER_T}
-    ${DIRA}
-    ${DISTR}
-    ${DVMH_REG}
-    ${DYNA}
-    ${EXPR_TRANSFORM}
-    ${GR_CALL}
-    ${GR_LOOP}
-    ${INLINER}
-    ${LOOP_ANALYZER}
-    ${RENAME_SYMBOLS}
-    ${TRANSFORMS}
-    ${PARALLEL_REG}
-    ${PRIV}
-    ${FDVM}
-    ${OMEGA}
-    ${UTILS}
-    ${VERIF}
-    ${VS_CALLS}
-    ${MAIN}
-    ${PREDICTOR}
-    ${PARSER}
-    ${PPPA}
-    ${ZLIB}
-    ${GR_LAYOUT}
-    ${PR_PARAM}
-    ${PROJ_MAN})
-
-add_executable(Sapfor_F ${SOURCE_EXE})
-source_group (CFGraph FILES ${CFG})
-source_group (CFGraph\\DataFlow FILES ${DATA_FLOW})
-
-source_group (Transformations\\DeadCodeRemoving FILES ${TR_DEAD_CODE})
-source_group (Transformations\\ExpressionSubstitution FILES ${EXPR_TRANSFORM})
-source_group (Transformations\\CheckPoints FILES ${TR_CP})
-source_group (Transformations\\LoopEndDoConverter FILES ${TR_ENDDO_LOOP})
-source_group (Transformations\\LoopNesting FILES ${TR_LOOP_NEST})
-source_group (Transformations\\LoopCombining FILES ${TR_LOOP_COMB})
-source_group (Transformations\\LoopSplitting FILES ${TR_LOOP_SPLIT})
-source_group (Transformations\\LoopUnrolling FILES ${TR_LOOP_UNROLL})
-source_group (Transformations\\FunctionDuplication FILES ${TR_FUNC_DUP})
-source_group (Transformations\\FunctionInlining FILES ${INLINER})
-source_group (Transformations\\FunctionPurifying FILES ${TR_FUNC_PURE})
-source_group (Transformations\\ArrayDimsSwapping FILES ${TR_SWAP_ARR_DIMS})
-source_group (Transformations\\PrivateArrayResizing FILES ${TR_PRIV_BR})
-source_group (Transformations\\PrivateArrayRemoving FILES ${TR_PRIV_DEL})
-source_group (Transformations\\VectorAssignToLoop FILES ${TR_VECTOR})
-source_group (Transformations\\RenameSymbols FILES ${RENAME_SYMBOLS})
-source_group (Transformations\\GlobalVariables FILES ${TR_GV})
-source_group (Transformations\\ConvertToC FILES ${TR_CONV})
-source_group (Transformations\\SetImplicitNone FILES ${TR_IMPLICIT_NONE})
-source_group (Transformations\\ReplaceArraysInIO FILES ${TR_REPLACE_ARRAYS_IN_IO})
-
-
-source_group (CreateIntervals FILES ${CREATE_INTER_T})
-source_group (DirectiveProcessing FILES ${DIRA})
-source_group (Distribution FILES ${DISTR})
-source_group (DvmhRegions FILES ${DVMH_REG})
-source_group (DynamicAnalysis FILES ${DYNA})
-source_group (GraphCall FILES ${GR_CALL})
-source_group (GraphLoop FILES ${GR_LOOP})
-source_group (LoopAnalyzer FILES ${LOOP_ANALYZER})
-source_group (ParallelizationRegions FILES ${PARALLEL_REG})
-source_group (PrivateAnalyzer FILES ${PRIV})      
-source_group (FDVM_Compiler FILES ${FDVM})
-source_group (SageExtension FILES ${OMEGA})
-source_group (Utils FILES ${UTILS})
-source_group (VerificationCode FILES ${VERIF})       
-source_group (ProjectParameters FILES ${PR_PARAM})
-source_group (ProjectManipulation FILES ${PROJ_MAN})
-
-source_group (VisualizerCalls FILES ${VS_CALLS})
-source_group (VisualizerCalls\\GraphLayout FILES ${GR_LAYOUT})
-
-source_group (_SapforMain FILES ${MAIN})
-source_group (Predictor FILES ${PREDICTOR})
-source_group (Parser FILES ${PARSER})
-source_group (PPPA\\PPPA FILES ${PPPA})
-source_group (PPPA\\ZLib FILES ${ZLIB})
-   
-if (MSVC_IDE)   
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Zc:__cplusplus")
-else()
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-endif()
-
-add_subdirectory(projects/Fdvm)
-
-add_definitions("-D __SPF")
-add_definitions("-D _CRT_SECURE_NO_WARNINGS")
-add_definitions("-D _CRT_NON_CONFORMING_SWPRINTFS")
-
-add_subdirectory(projects/SageOldSrc)
-add_subdirectory(projects/SageNewSrc)
-add_subdirectory(projects/SageLib)
-add_subdirectory(projects/Parser)
-
-add_definitions("-D __SPF_BUILT_IN_FDVM")
-add_definitions("-D __SPF_BUILT_IN_PARSER")
-add_definitions("-D __SPF_BUILT_IN_PPPA")
-
-if (WIN32)
-    target_link_libraries(Sapfor_F SageNewSrc SageLib SageOldSrc)
-elseif(APPLE)
-    target_link_libraries(Sapfor_F SageNewSrc SageLib SageOldSrc pthread)
-elseif(UNIX)
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
-        target_link_libraries(Sapfor_F SageNewSrc SageLib SageOldSrc pthread stdc++fs)
-    else()
-        target_link_libraries(Sapfor_F SageNewSrc SageLib SageOldSrc pthread)
-    endif()
-endif()
-
-#install(TARGETS <name.exe/dll>
-#    LIBRARY DESTINATION <name_f>
-#   RUNTIME DESTINATION <name_f>)

dvm/fdvm/trunk/Sage/h/tag

@@ -624,5 +624,4 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
-#define SPF_WEIGHT_OP			 975     /* SAPFOR */
 

dvm/fdvm/trunk/Sage/h/tag.h

@@ -626,5 +626,4 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
   tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
   tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
-  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
 

dvm/fdvm/trunk/Sage/lib/include/bif_node.def

@@ -464,7 +464,6 @@ DEFNODECODE(SPF_UNROLL_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_COVER_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_MERGE_OP, "nodetext",'e',0,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_PROCESS_PRIVATE_OP, "nodetext",'e',1,LLNODE,	'_','_','_','_','_')
-DEFNODECODE(SPF_WEIGHT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
 
 DEFNODECODE(SPF_ANALYSIS_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
 DEFNODECODE(SPF_PARALLEL_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')

dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def

@@ -434,15 +434,11 @@ DEFNODECODE(SPF_PARAMETER_OP,         "PARAMETER (%LL1)",
 'e',1,LLNODE)
 DEFNODECODE(SPF_UNROLL_OP,            "UNROLL %IF(%LL1 != %NULL)(%LL1)%ENDIF",
 'e',1,LLNODE)
-DEFNODECODE(SPF_MERGE_OP,             "MERGE",
+DEFNODECODE(SPF_MERGE_OP,            "MERGE",
 'e',0,LLNODE)
-DEFNODECODE(SPF_COVER_OP,             "COVER (%LL1)",
+DEFNODECODE(SPF_COVER_OP,            "COVER (%LL1)",
 'e',1,LLNODE)
-DEFNODECODE(SPF_PROCESS_PRIVATE_OP,   "PROCESS_PRIVATE (%LL1)",
+DEFNODECODE(SPF_PROCESS_PRIVATE_OP,  "PROCESS_PRIVATE (%LL1)",
 'e',1,LLNODE)
-DEFNODECODE(SPF_WEIGHT_OP,	      "WEIGHT (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_CODE_COVERAGE_OP,     "CODE_COVERAGE",
-'e',0,LLNODE)