summaryrefslogtreecommitdiff
path: root/macros/CCodeGeneration
diff options
context:
space:
mode:
Diffstat (limited to 'macros/CCodeGeneration')
-rw-r--r--macros/CCodeGeneration/C_GenerateMkfle_arduino.sci15
-rw-r--r--macros/CCodeGeneration/C_IfExpression.sci24
-rw-r--r--macros/CCodeGeneration/C_WhileExpression.sci16
-rw-r--r--macros/CCodeGeneration/GetClsFileName.sci12
-rw-r--r--macros/CCodeGeneration/JoinDeclarAndCcode.sci7
-rw-r--r--macros/CCodeGeneration/names3
6 files changed, 0 insertions, 77 deletions
diff --git a/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci
index 2b9ca6c..b43eb44 100644
--- a/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci
+++ b/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci
@@ -1,18 +1,3 @@
-<<<<<<< HEAD
-=======
-// 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: Yash Pratap Singh Tomar
-// Organization: FOSSEE, IIT Bombay
-// Email: toolbox@scilab.in
-
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
function C_GenerateMkfle_arduino(FileInfo,SharedInfo)
PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y');
diff --git a/macros/CCodeGeneration/C_IfExpression.sci b/macros/CCodeGeneration/C_IfExpression.sci
index 17138dc..630134e 100644
--- a/macros/CCodeGeneration/C_IfExpression.sci
+++ b/macros/CCodeGeneration/C_IfExpression.sci
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo)
-=======
-function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo)
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo)
// -----------------------------------------------------------------
// //NUT: add description here
@@ -24,7 +20,6 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,
// ------------------------------
// --- Check input arguments. ---
// ------------------------------
-<<<<<<< HEAD
SCI2CNInArgCheck(argn(2),7,7);
//global SCI2CSTACK
@@ -35,14 +30,6 @@ SCI2CNInArgCheck(argn(2),7,7);
//if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
// error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
//end
-=======
-SCI2CNInArgCheck(argn(2),5,5);
-
-// --- Check NIfCondArg value. ---
-if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
- error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
-end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// -----------------------
// --- Initialization. ---
@@ -55,11 +42,7 @@ CPass1FileName = FileInfo.Funct(nxtscifunnumber).CPass1FileName;
// #RNU_RES_B
PrintStringInfo(' ',ReportFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('***Generating C code***'+ string(NIfCondArg),ReportFileName,'file','y');
-=======
-PrintStringInfo('***Generating C code***',ReportFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// #RNU_RES_E
// ---------------------------
// --- End Initialization. ---
@@ -88,7 +71,6 @@ if SCI2Cstrncmps1size(ASTIfExpType,'else')
SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out');
end
-<<<<<<< HEAD
i=1;
k=1;
CCall ='';
@@ -106,12 +88,6 @@ if (ASTIfExpType~='else')
i = i + 1;
end
CCall = CCall+')';
-=======
-CCall ='';
-CCall = CCall+CFunName;
-if (ASTIfExpType~='else')
- CCall = CCall+'('+IfCondArg(1)+')';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
end
PrintStringInfo(' '+CCall,ReportFileName,'file','y');
PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
diff --git a/macros/CCodeGeneration/C_WhileExpression.sci b/macros/CCodeGeneration/C_WhileExpression.sci
index 00c6005..36fcc4f 100644
--- a/macros/CCodeGeneration/C_WhileExpression.sci
+++ b/macros/CCodeGeneration/C_WhileExpression.sci
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo)
-=======
-function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
// -----------------------------------------------------------------
// //NUT: add description here
@@ -24,11 +20,7 @@ function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
// ------------------------------
// --- Check input arguments. ---
// ------------------------------
-<<<<<<< HEAD
SCI2CNInArgCheck(argn(2),6,6);
-=======
-SCI2CNInArgCheck(argn(2),2,2);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// -----------------------
// --- Initialization. ---
@@ -72,11 +64,7 @@ for cntstr = 1:NumCStrings
// Epilogue
if (length(C_Strings(cntstr)) == 0)
C_Strings(cntstr) = ' '; // RNU for Bruno: If I don't do that I get a PrintStringInfo error related to mputstr.
-<<<<<<< HEAD
// Function not defined for given argument type(s),
-=======
- // Function not defined for given argument type(s),
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// check arguments or define function %0_mputstr for overloading.
end
PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n');
@@ -89,7 +77,6 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y');
// ------------------------------
// --- Insert for expression. ---
// ------------------------------
-<<<<<<< HEAD
//CCall = 'while('+SharedInfo.WhileExpr.CondVar+')';
//PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
@@ -111,9 +98,6 @@ CCall = CCall+'while';
CCall = CCall+')';
PrintStringInfo(' '+CCall,ReportFileName,'file','y');
-=======
-CCall = 'while('+SharedInfo.WhileExpr.CondVar+')';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
// -------------------
diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci
index 619c493..4220410 100644
--- a/macros/CCodeGeneration/GetClsFileName.sci
+++ b/macros/CCodeGeneration/GetClsFileName.sci
@@ -45,10 +45,7 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename)
// #RNU_RES_B
// It is a C function of the USER2C library.
// #RNU_RES_E
-<<<<<<< HEAD
PrintStringInfo('cUser2c',ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -57,10 +54,7 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename)
// #RNU_RES_B
// It is a scilab function of the USER2C library.
// #RNU_RES_E
-<<<<<<< HEAD
PrintStringInfo('fUser2c',ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -69,10 +63,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename))
// #RNU_RES_B
// It is a C function of the SCI2C library.
// #RNU_RES_E
-<<<<<<< HEAD
PrintStringInfo('csci2c',ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -81,10 +72,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename))
// #RNU_RES_B
// It is a scilab function of the SCI2C library.
// #RNU_RES_E
-<<<<<<< HEAD
PrintStringInfo('fsci2c',ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.sci b/macros/CCodeGeneration/JoinDeclarAndCcode.sci
index 4a2906c..35607f6 100644
--- a/macros/CCodeGeneration/JoinDeclarAndCcode.sci
+++ b/macros/CCodeGeneration/JoinDeclarAndCcode.sci
@@ -146,17 +146,10 @@ PrintStringInfo('** --- C code. ---',CPass2FileName,'file','y');
PrintStringInfo('** ---------------',CPass2FileName,'file','y');
PrintStringInfo('*/',CPass2FileName,'file','y');
-<<<<<<< HEAD
//if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName))
//Add wiringPiSetup() function as it is required
// PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y');
//end
-=======
-if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName))
- //Add wiringPiSetup() function as it is required
- PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y');
-end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Copy the remaining part of V1 in V2. ---
while (~meof(CPass1V1FileFid))
// #RNU_RES_B
diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names
index 96b24bd..56caa81 100644
--- a/macros/CCodeGeneration/names
+++ b/macros/CCodeGeneration/names
@@ -2,10 +2,7 @@ C_FinalizeCode
C_ForExpression
C_Funcall
C_GenDeclarations
-<<<<<<< HEAD
C_GenDeclarations_Dup
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
C_GenerateFunName
C_GenerateLaunchScript
C_GenerateMakefile
generated by cgit (git 2.34.1) at 2024-12-20 22:42:09 +0000