summaryrefslogtreecommitdiff
path: root/macros/FunctionAnnotation/FA_GetFunAnn.sci
diff options
context:
space:
mode:
authoryash11122017-07-07 22:03:16 +0530
committeryash11122017-07-07 22:03:16 +0530
commit69c573fe2e59236f063aaa94dcd44b556f945cbc (patch)
tree08fa381bec620e38c7a3d2a34448d30160d861eb /macros/FunctionAnnotation/FA_GetFunAnn.sci
parent87823db220f4c3b8bee16c0b2e08027704de1efe (diff)
parent3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff)
downloadscilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz
scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2
scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip
Scilab2C Arduino Updated
Diffstat (limited to 'macros/FunctionAnnotation/FA_GetFunAnn.sci')
-rw-r--r--macros/FunctionAnnotation/FA_GetFunAnn.sci7
1 files changed, 7 insertions, 0 deletions
diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci
index 3fadd1f2..daf012f1 100644
--- a/macros/FunctionAnnotation/FA_GetFunAnn.sci
+++ b/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