Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved Sage, fixed dedlock

Browse Source
This commit is contained in:
ALEXks
2023-12-06 12:01:00 +03:00
parent f08f46a536
commit 2540237e42
8 changed files with 13592 additions and 13585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dvm/fdvm/trunk/Sage/lib/include/libSage++.h
View File

@@ -243,9 +243,9 @@ public:
inline void replaceSymbBySymb(SgSymbol &symb, SgSymbol &newsymb); inline void replaceSymbBySymb(SgSymbol &symb, SgSymbol &newsymb);
inline void replaceSymbBySymbSameName(SgSymbol &symb, SgSymbol &newsymb); inline void replaceSymbBySymbSameName(SgSymbol &symb, SgSymbol &newsymb);
inline void replaceTypeInStmt(SgType &old, SgType &newtype); inline void replaceTypeInStmt(SgType &old, SgType &newtype);
char* unparse(int lang = 2); // FORTRAN_LANG char* unparse(int lang = 0); // FORTRAN_LANG
inline void unparsestdout(); inline void unparsestdout();
std::string sunparse(int lang = 2); // FORTRAN_LANG std::string sunparse(int lang = 0); // FORTRAN_LANG
inline char *comments(); //preceding comment lines. inline char *comments(); //preceding comment lines.
void addComment(const char *com); void addComment(const char *com);
void addComment(char *com); void addComment(char *com);
@@ -3684,7 +3684,7 @@ inline char* SgStatement::unparse(int lang)
#ifdef __SPF #ifdef __SPF
checkConsistence(); checkConsistence();
#endif #endif
return UnparseBif_Char(thebif, lang); //2 - fortran language return UnparseBif_Char(thebif, lang); //0 - fortran language
} }
inline void SgStatement::unparsestdout() inline void SgStatement::unparsestdout()

5
dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
View File

@@ -13,6 +13,7 @@ mkC++extern $SAGEROOT/lib/newsrc/low_level.c > ! $SAGEROOT/lib/include/extcxx_lo
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> /* ANSI variable argument header */ #include <stdarg.h> /* ANSI variable argument header */
#include <ctype.h>
#include "compatible.h" /* Make different system compatible... (PHB) */ #include "compatible.h" /* Make different system compatible... (PHB) */
#ifdef SYS5 #ifdef SYS5
@@ -1028,7 +1029,7 @@ void UnparseBif(bif)
/* podd 28.01.07 */ /*change podd 16.12.11*/ /* podd 28.01.07 */ /*change podd 16.12.11*/
char *UnparseBif_Char(bif,lang) char *UnparseBif_Char(bif,lang)
PTR_BFND bif; PTR_BFND bif;
int lang; /* 0 - undefined, 1 - C language, 2 - Fortran language */ int lang; /* ForSrc=0 - Fortran language, CSrc=1 - C language */
{ {
char *s; char *s;
/* PTR_BLOB b, bl; /* PTR_BLOB b, bl;
@@ -8932,7 +8933,7 @@ void updateSymbInInterfaceBlock(PTR_BFND block)
} }
} }
updateSymbolsOfList(PTR_LLND slist, PTR_BFND struct_stmt) void updateSymbolsOfList(PTR_LLND slist, PTR_BFND struct_stmt)
{ {
PTR_LLND ll; PTR_LLND ll;
PTR_SYMB symb, newsymb; PTR_SYMB symb, newsymb;

2
dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
View File

@@ -12,6 +12,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> /* podd 15.03.99*/ #include <stdlib.h> /* podd 15.03.99*/
#include <ctype.h>
#include "compatible.h" /* Make different system compatible... (PHB) */ #include "compatible.h" /* Make different system compatible... (PHB) */
#ifdef SYS5 #ifdef SYS5
#include <string.h> #include <string.h>

1
dvm/fdvm/trunk/parser/ftn.gram
View File

@@ -404,6 +404,7 @@ void startioctl();
void endioctl(); void endioctl();
void redefine_func_arg_type(); void redefine_func_arg_type();
int isResultVar(); int isResultVar();
int yylex();
/* used by FORTRAN M */ /* used by FORTRAN M */
PTR_BFND make_processdo(); PTR_BFND make_processdo();

2399
dvm/fdvm/trunk/parser/gram1.tab.c
View File

File diff suppressed because it is too large Load Diff

1
dvm/fdvm/trunk/parser/gram1.y
View File

@@ -756,6 +756,7 @@ void startioctl();
void endioctl(); void endioctl();
void redefine_func_arg_type(); void redefine_func_arg_type();
int isResultVar(); int isResultVar();
int yylex();
/* used by FORTRAN M */ /* used by FORTRAN M */
PTR_BFND make_processdo(); PTR_BFND make_processdo();

1
sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
View File

@@ -2919,6 +2919,7 @@ private:
#ifdef _MSC_VER #ifdef _MSC_VER
ret = pipe(pipes, 1024 * 1024 * 20, O_BINARY); // 20 MB ret = pipe(pipes, 1024 * 1024 * 20, O_BINARY); // 20 MB
#else #else
fcntl(*pipes, F_SETPIPE_SZ, 1024 * 1024 * 20);
ret = pipe(pipes) == -1; ret = pipe(pipes) == -1;
#endif #endif
fd_blocked = (errno == EINTR || errno == EBUSY); fd_blocked = (errno == EINTR || errno == EBUSY);

2
sapfor/experts/Sapfor_2017/_src/Utils/version.h
View File

@@ -1,3 +1,3 @@
#pragma once #pragma once
#define VERSION_SPF "2254" #define VERSION_SPF "2255"