msp4th: ignore comments

diff --git a/msp4th/Makefile b/msp4th/Makefile
index 0a20f6f550ffc15bcf2f6ba395959515e0855066..d6b3ffafc3c880ce22a1d8a322c2e7dc6e0aa320 100644 (file)
--- a/msp4th/Makefile
+++ b/msp4th/Makefile
@@ -12,8 +12,8 @@ SHELL = /bin/bash
 
 TARGET     = main
 #MCU        = msp430f5529
-#MCU        = msp1
-MCU        = msp430x2013
+MCU        = msp2
+#MCU        = msp430x2013
 # List all the source files here
 # eg if you have a source file foo.c then list it here
 SOURCES = main.c ns430-uart.c msp4th.c

diff --git a/msp4th/msp4th.c b/msp4th/msp4th.c
index 2ecf5b4334ef0a572abf5d34fc24debc177829b8..b05ac3b1c12448927a798175bea89e9497f6114d 100644 (file)
--- a/msp4th/msp4th.c
+++ b/msp4th/msp4th.c
@@ -333,18 +333,22 @@ static int16_t __inline__ RAMerrors(void){
 
 
 uint8_t getKeyB(){
-  uint8_t c;
-  c = lineBuffer[lineBufferPtr];
-  if (c != 0) {
-      lineBufferPtr = lineBufferPtr + 1;
-  }
-  return(c);
+    uint8_t c;
+
+    c = lineBuffer[lineBufferPtr++];
+    if (c == 0) {
+        getLine();
+        c = lineBuffer[lineBufferPtr++];
+    }
+
+    return (c);
 }
 
 
+
 void getLine()
 {
-    uint16_t waiting;
+    int16_t waiting;
     uint8_t c;
 
     lineBufferPtr = 0;
@@ -357,28 +361,23 @@ void getLine()
     while (waiting) {  // just hang in loop until we get CR
         c = uart_getchar();
 
-        if (c == '\b') {
-            if (lineBufferPtr > 0) {
-                uart_putchar('\b');
-                uart_putchar(' ');
-                uart_putchar('\b');
-                lineBufferPtr--;
-            }
+        if ((c == '\b') && (lineBufferPtr > 0)) {
+            uart_putchar('\b');
+            uart_putchar(' ');
+            uart_putchar('\b');
+            lineBufferPtr--;
+        } else if ( ((c == 255) || (c == '\ 4')) && (lineBufferPtr == 0)) {
+            xit = 1;
+            waiting = 0;
         } else {
             uart_putchar(c);
-            if ((c == '\r') || (c == '\n')) {
-                // hit cr
-                lineBuffer[lineBufferPtr] = 0;
+            if ( (c == '\r') ||
+                 (c == '\n') ||
+                 (lineBufferPtr >= (LINE_SIZE - 1))) { // prevent overflow of line buffer
                 waiting = 0;
-            } else {
-
-                lineBuffer[lineBufferPtr++] = c;
-                lineBuffer[lineBufferPtr] = 0;
-
-                if(lineBufferPtr >= 127) {  // prevent overflow of line buffer
-                    waiting = 0;
-                }
             }
+            lineBuffer[lineBufferPtr++] = c;
+            lineBuffer[lineBufferPtr] = 0;
         }
     }
     uart_putchar('\n');
@@ -387,33 +386,71 @@ void getLine()
 
 
 
-void getWord(void)
+uint8_t nextPrintableChar(void)
 {
-    int16_t i;
-    uint16_t k;
     uint8_t c;
-    int16_t waiting;
 
-    for (i=0; i < WORD_SIZE; i++) {
-        wordBuffer[i] = 0;
+    c = getKeyB();
+    while (c <= ' ') {
+        c = getKeyB();
     }
 
-    waiting = 1;
-    k = 0;
-    while (1) {
+    return (c);
+}
+
+
+uint8_t skipStackComment(void)
+{
+    uint8_t c;
+
+    c = getKeyB();
+    while (c != ')') {
         c = getKeyB();
+    }
+
+    c = nextPrintableChar();
+
+    return (c);
+}
+
+
+void getWord(void)
+{
+    int16_t k;
+    uint8_t c;
 
-        if (c == 0) {
-            getLine();
-        } else if (c > ' ') {
-            break;
+
+    for (k=0; k < WORD_SIZE; k++) {
+        wordBuffer[k] = 0;
+    }
+
+    c = nextPrintableChar();
+
+    // comments
+    while ((c == '(') || (c == 92)) {
+        switch (c) {
+            // '(' + anything + ')'
+            case '(':
+                c = skipStackComment();
+                break;
+            // '\' backslash -- to end of line
+            case 92:
+                getLine();
+                c = nextPrintableChar();
+                break;
+            default:
+                break;
         }
     }
 
+    k = 0;
     wordBuffer[k++] = c;
+    wordBuffer[k] = 0;
+
     c = getKeyB();
     while (c > ' ') {
         wordBuffer[k++] = c;
+        wordBuffer[k] = 0;
         c = getKeyB();
     }
 }
@@ -430,28 +467,24 @@ void listFunction()
   
 int16_t popMathStack(void)
 {
-    uint16_t i;
-    int16_t j,k;
+    int16_t i;
+    int16_t j;
 
-    k = 1;
     j = mathStack[0];
 
     for (i=1;i<MATH_STACK_SIZE;i++) {
         mathStack[i-1] = mathStack[i];
     }
 
-    k = 0;
     return(j);
 }
 
 void pushMathStack(int16_t n)
 {
-    uint16_t i;
-    uint16_t tmp;
+    int16_t i;
 
     for (i=MATH_STACK_SIZE - 2; i > 0; i--) {
-        tmp = i - 1;
-        mathStack[i] = mathStack[tmp];
+        mathStack[i] = mathStack[i-1];
     }
     mathStack[0] = n;
 }
@@ -460,13 +493,13 @@ int16_t popAddrStack(void)
 {
     int16_t j;
     j = addrStack[addrStackPtr];
-    addrStackPtr = addrStackPtr + 1;
+    addrStackPtr++;
     return(j);
 }
 
 void pushAddrStack(int16_t n)
 {
-    addrStackPtr = addrStackPtr - 1;
+    addrStackPtr--;
     addrStack[addrStackPtr] = n;
 }
 
@@ -821,7 +854,7 @@ void execN(int16_t n){
       prog[progPtr] = popMathStack();
       progPtr = progPtr + 1;
       if(progPtr >= PROG_SPACE){
-        uart_puts((str_t *)"prog mem");
+        uart_puts((str_t *)"ERR: prog full");
       }
       break;
 

diff --git a/msp4th/test4th.c b/msp4th/test4th.c
index ba8a5f98b2c8f480822b8f783d42bfaa5e309cb5..18b96b71bb9dc406da7586d8a04540ae4955363c 100644 (file)
--- a/msp4th/test4th.c
+++ b/msp4th/test4th.c
@@ -6,9 +6,7 @@
 
 int main(void)
 {
-
     init_msp4th();
-
     processLoop();
 
     return 0;