10 files changed, 126 insertions, 0 deletions
diff --git a/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.sci b/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.sci
new file mode 100644
index 00000000..c1dc9e50
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.sci
@@ -0,0 +1,9 @@
+function outp=FA_FSFIRLIN_SZ(in1sz2)
+    in1sz2=string(in1sz2);
+    in1sz=eval(in1sz2);
+    if(int(in1sz/2)==in1sz/2)  then
+        outp=string(4*in1sz+1);
+    else
+        outp=string(4*in1sz+3);
+    end
+endfunction
diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci
index d11e3cee..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,5 +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/macros/FunctionAnnotation/FA_INSZ_RPI.sci b/macros/FunctionAnnotation/FA_INSZ_RPI.sci
new file mode 100644
index 00000000..da924ce4
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_INSZ_RPI.sci
@@ -0,0 +1,5 @@
+function outp=FA_INSZ_RPI(in2val)
+    in2val=string(in2val);
+    l=length(in2val);
+    outp=l;
+endfunction
diff --git a/macros/FunctionAnnotation/FA_SZ_AMELL.sci b/macros/FunctionAnnotation/FA_SZ_AMELL.sci
new file mode 100644
index 00000000..6cf27b0d
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_AMELL.sci
@@ -0,0 +1,9 @@
+function outp=FA_SZ_AMELL(in1sz)
+	in1sz=string(in1sz);
+	insz=eval(in1sz);
+	if(insz>1) then
+		outp=string(insz);
+	else
+		outp="1";
+	end
+endfunction
diff --git a/macros/FunctionAnnotation/FA_SZ_MODSN.sci b/macros/FunctionAnnotation/FA_SZ_MODSN.sci
new file mode 100644
index 00000000..4a58e644
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_MODSN.sci
@@ -0,0 +1,11 @@
+function outt=FA_SZ_MODSN(in1sz)
+
+in1sz=string(in1sz);
+in1s=eval(in1sz)
+if(in1s>1) then
+	outt=string(in1s);
+else
+	outt=string(1);
+end
+
+endfunction
diff --git a/macros/FunctionAnnotation/FA_SZ_U_SVA.sci b/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
new file mode 100644
index 00000000..3b8b25c5
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
@@ -0,0 +1,39 @@
+function opout = FA_SZ_U_SVA(in1,in2)
+
+// function opout = FA_SZ_U_SVA(in1,in2)
+// -----------------------------------------------------------------
+// Determines the number of rows of the output arguments 
+// according to the second input argument.
+//
+// Input data:
+// in1: specifying a matrix or a symbol.
+// in2: string specifying a number or a symbol.
+//
+// Output data:
+// opout: string containing the computed size of U matrix.
+//
+// Copyright (C) 2017 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Sandeep Gupta
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+//
+// -----------------------------------------------------------------
+
+//in1 = string(in1);
+// disp(in1)
+// disp(in2)
+//in1 = eval(in1);
+//in2 = string(in2);
+//in2 = eval(in2);
+//[U,S,V] = sva(in1,in2);
+//outsize = size(U)
+//opout = outsize(2)
+opout = string(in2)
+
+endfunction
diff --git a/macros/FunctionAnnotation/FA_TP_ASCII.sci b/macros/FunctionAnnotation/FA_TP_ASCII.sci
new file mode 100644
index 00000000..e05dd7ae
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_TP_ASCII.sci
@@ -0,0 +1,10 @@
+function outtp=FA_TP_ASCII(in1tp)
+
+in1tp=string(in1tp);
+if(in1tp=='g') then
+	outtp='u8';
+else 
+	outtp='g';
+end
+
+endfunction
diff --git a/macros/FunctionAnnotation/FA_TP_MODSN.sci b/macros/FunctionAnnotation/FA_TP_MODSN.sci
new file mode 100644
index 00000000..f766b4e7
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_TP_MODSN.sci
@@ -0,0 +1,10 @@
+function outtp=FA_TP_MODSN(in1tp)
+
+in1tp=string(in1tp);
+if(in1tp=='d') then
+	outtp='d';
+else
+	outtp='z';
+end
+
+endfunction
diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
index 005780a4..0e229452 100644
--- a/macros/FunctionAnnotation/lib
+++ b/macros/FunctionAnnotation/lib
diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names
index 8962de09..32c8f072 100644
--- a/macros/FunctionAnnotation/names
+++ b/macros/FunctionAnnotation/names
@@ -1,9 +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
@@ -14,6 +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
@@ -26,6 +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
@@ -57,6 +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
@@ -66,6 +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