BAS: Remove some code that I removed too aggressively

This commit is contained in:
Gregory Nutt 2014-11-03 09:52:31 -06:00
parent d7eaa25129
commit 15d7d85c19

View File

@ -78,6 +78,8 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <nuttx/ascii.h>
#include "fs.h" #include "fs.h"
/**************************************************************************** /****************************************************************************
@ -279,32 +281,68 @@ static int edit(int chn, int onl)
return -1; return -1;
} }
/* Check for the backspace charactor */
if (ch == ASCII_BS)
{
if (f->inCapacity)
{
#ifdef CONFIG_INTERPREPTER_BAS_VT100 #ifdef CONFIG_INTERPREPTER_BAS_VT100
/* REVISIT: Use VT100 commands to erase */ /* REVISIT: Use VT100 commands to erase: Move cursor back and erase to the end of the line */
#warning Missing Logic #warning Missing Logic
#else #else
if ((f->inCapacity + 1) < sizeof(f->inBuf)) /* Use backspace to erase */
if (f->inBuf[f->inCapacity - 1] >= '\0' &&
f->inBuf[f->inCapacity - 1] < ' ')
{
FS_putChars(chn, "\b\b \b\b");
}
else
{
FS_putChars(chn, "\b \b");
}
#endif
--f->inCapacity;
}
}
/* Is there space for another character in the buffer? */
else if ((f->inCapacity + 1) < sizeof(f->inBuf))
{ {
/* Yes.. Was this a new line character? */
if (ch != '\n') if (ch != '\n')
{ {
/* No.. was this an ASCII control character? */
if (ch >= '\0' && ch < ' ') if (ch >= '\0' && ch < ' ')
{ {
/* Yes.. Echo control characters as escape sequences */
FS_putChar(chn, '^'); FS_putChar(chn, '^');
FS_putChar(chn, ch ? (ch + 'a' - 1) : '@'); FS_putChar(chn, ch ? (ch + 'a' - 1) : '@');
} }
else else
{ {
/* No.. Just echo the character */
FS_putChar(chn, ch); FS_putChar(chn, ch);
} }
} }
/* Should we echo newline characters? */
else if (onl) else if (onl)
{ {
FS_putChar(chn, '\n'); FS_putChar(chn, '\n');
} }
/* Put the raw character into the buffer in any event */
f->inBuf[f->inCapacity++] = ch; f->inBuf[f->inCapacity++] = ch;
} }
#endif
} }
while (ch != '\n'); while (ch != '\n');