diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /macros/SymbolTable | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/SymbolTable')
| -rw-r--r-- | macros/SymbolTable/ST_AnalyzeScope.sci | 4 | ||||
| -rw-r--r-- | macros/SymbolTable/names | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/macros/SymbolTable/ST_AnalyzeScope.sci b/macros/SymbolTable/ST_AnalyzeScope.sci index 8389c09a..f3b041a0 100644 --- a/macros/SymbolTable/ST_AnalyzeScope.sci +++ b/macros/SymbolTable/ST_AnalyzeScope.sci @@ -84,6 +84,10 @@ for cntout = 1:NOutArg // #RNU_RES_E
OutArg(cntout).Scope = 'Local';
end
+<<<<<<< HEAD +======= +
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B
// --- Check in global symbol table. ---
// #RNU_RES_E
diff --git a/macros/SymbolTable/names b/macros/SymbolTable/names index c2efc843..2ce0db05 100644 --- a/macros/SymbolTable/names +++ b/macros/SymbolTable/names @@ -6,7 +6,10 @@ ST_GetInArgInfo ST_GetSymbolInfo ST_InsForCntVars ST_InsOutArg +<<<<<<< HEAD ST_InsOutArg_Dup +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 ST_Load ST_MatchSymbol ST_Save |