yann64/Yab2Cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revamped printSegment to get rid of phantom EOLs

Browse Source
This commit is contained in:
Samuel D. Crow 2022-06-30 12:55:25 -05:00
parent 7f1539c421
commit a9f2818b05
1 changed files with 72 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
yabIO.cpp
View File

@ -8,6 +8,11 @@
*/ */
#include "yab2cpp.h" #include "yab2cpp.h"
/* prototypes for local functions */
string formatString(enum SEPARATORS s);
string formatInt(enum SEPARATORS s);
string formatFloat(enum SEPARATORS s);
printSegment::printSegment(expression *e, enum SEPARATORS s) printSegment::printSegment(expression *e, enum SEPARATORS s)
{ {
cargo=e; cargo=e;
@ -22,31 +27,82 @@ void printSegment::generate()
switch (op->getSimpleVarType()) switch (op->getSimpleVarType())
{ {
case T_STRINGVAR: case T_STRINGVAR:
output_cpp << "puts(" << op->boxName() << ".c_str());\n"; output_cpp << "printf(\"" << formatString(sep) << "\","
<< op->boxName() << ".c_str());\n";
break; break;
case T_INTVAR: case T_INTVAR:
output_cpp << "printf(\"%d\", " << op->boxName() << ");\n"; output_cpp << "printf(\"" << formatInt(sep) << "\", "
<< op->boxName() << ");\n";
break; break;
case T_FLOATVAR: case T_FLOATVAR:
output_cpp << "printf(\"%f\", " << op->boxName() << ");\n"; output_cpp << "printf(\"" << formatFloat(sep) << "\", "
<< op->boxName() << ");\n";
break; break;
default: default:
error(E_TYPE_MISMATCH); error(E_TYPE_MISMATCH);
break; break;
} }
return;
} }
switch (sep) switch (sep) {
{
case S_LINEFEED: case S_LINEFEED:
output_cpp << "puts(\"\\n\");\n"; output_cpp << "puts(\"\\n\");\n";
return; break;
case S_SEMICOLON:
return;
case S_COMMA: case S_COMMA:
output_cpp << "putchar('\\t');\n"; output_cpp << "putchar(\'\\t\');\n";
return; break;
case S_SEMICOLON:
break;
default: default:
error(E_BAD_SYNTAX); error(E_INTERNAL);
break; break;
} }
} }
string formatString(enum SEPARATORS s)
{
switch (s)
{
case S_LINEFEED:
return string("%s\\n");
case S_COMMA:
return string("%s\\t");
case S_SEMICOLON:
return string("%s");
default:
error(E_BAD_SYNTAX);
return string("");
}
}
string formatInt(enum SEPARATORS s)
{
switch (s)
{
case S_LINEFEED:
return string("%d\\n");
case S_COMMA:
return string("%d\\t");
case S_SEMICOLON:
return string("%d");
default:
error(E_BAD_SYNTAX);
return string("");
}
}
string formatFloat(enum SEPARATORS s)
{
switch (s)
{
case S_LINEFEED:
return string("%f\\n");
case S_COMMA:
return string("%f\\t");
case S_SEMICOLON:
return string("%f");
default:
error(E_BAD_SYNTAX);
return string("");
}
}