diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2a6c003c67faafd257984f4ae632e40bc6fa9a32 (patch) | |
| tree | 5eecfb962980f7c32cd167bd7e124166e4741343 /2.3-1/macros/FunctionAnnotation | |
| parent | ce61940a1398e66d9d09b81241789576c1ceca01 (diff) | |
| parent | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (diff) | |
| download | Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.gz Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.bz2 Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to '2.3-1/macros/FunctionAnnotation')
| -rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci | 7 | ||||
| -rw-r--r-- | 2.3-1/macros/FunctionAnnotation/names | 18 |
2 files changed, 25 insertions, 0 deletions
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index 3fadd1f2..daf012f1 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -52,7 +52,11 @@ FunSizeAnnot = ''; // ---------------------------------------------
// --- Open the .sci file (read only). ---
inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
+<<<<<<< HEAD PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
+======= +
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B
// --- Loop over the lines of the input file. ---
// Position file pointer to the desired NInArg/NOutArg section,
@@ -212,6 +216,9 @@ mclose(inclsfid); // -------------------------------------------------
// --- End Read the annotations of the function. ---
// -------------------------------------------------
+<<<<<<< HEAD PrintStringInfo(' end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
+======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 423c825a..32c8f072 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -1,11 +1,17 @@ FA_ADD FA_DIV +<<<<<<< HEAD FA_FSFIRLIN_SZ +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_GetDefaultPrecision FA_GetFunAnn FA_GetOutArgInfo FA_GetResizeApproach +<<<<<<< HEAD FA_INSZ_RPI +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_INT FA_MAX FA_MIN @@ -16,7 +22,10 @@ FA_SCHUR_TP FA_SUB FA_SZ_1 FA_SZ_2 +<<<<<<< HEAD FA_SZ_AMELL +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_SZ_COLUMN_DIAG FA_SZ_COL_DIAG_IN_EX FA_SZ_DEC2BASE @@ -29,7 +38,10 @@ FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW FA_SZ_LQE FA_SZ_LQR +<<<<<<< HEAD FA_SZ_MODSN +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_SZ_OBSCNT FA_SZ_OPAPEX FA_SZ_OPBACKSLASH @@ -61,8 +73,11 @@ FA_SZ_ROW_DIAG FA_SZ_ROW_DIAG_INS_EXT FA_SZ_SEL1 FA_SZ_SEL2 +<<<<<<< HEAD FA_SZ_U_SVA FA_TP_ASCII +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_TP_C FA_TP_COMPLEX FA_TP_CVIMAGE @@ -72,7 +87,10 @@ FA_TP_INT16 FA_TP_INT8 FA_TP_MAX FA_TP_MIN_REAL +<<<<<<< HEAD FA_TP_MODSN +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_TP_REAL FA_TP_S FA_TP_UINT16 |