diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch) | |
| tree | f2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/macros/ASTManagement/names | |
| parent | e9de337a34e123749927039f7011fb30fc96f7c9 (diff) | |
| parent | 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff) | |
| download | Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2 Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip | |
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/macros/ASTManagement/names')
| -rw-r--r-- | 2.3-1/macros/ASTManagement/names | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/2.3-1/macros/ASTManagement/names b/2.3-1/macros/ASTManagement/names index 6deb883d..62b7d189 100644 --- a/2.3-1/macros/ASTManagement/names +++ b/2.3-1/macros/ASTManagement/names @@ -21,7 +21,10 @@ AST_ExtractNameAndScope AST_GetASTFile AST_GetFuncallPrm AST_GetPrecAndLhsArg +<<<<<<< HEAD AST_HandleCC +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 AST_HandleEOL AST_HandleEndFor AST_HandleEndGenFun @@ -29,11 +32,16 @@ AST_HandleEndProgram AST_HandleEndWhile AST_HandleFor AST_HandleForStatem +<<<<<<< HEAD AST_HandleFunCC AST_HandleFunRC AST_HandleHeader AST_HandleIfElse AST_HandleRC +======= +AST_HandleHeader +AST_HandleIfElse +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 AST_HandleWhileExpr AST_HandleWhileStatem AST_ParseEqualStruct |