Switch to using Print and Stream classes internally

.gitignore

@@ -1,3 +1,5 @@
+*.swp
+*.swo
 */.DS_Store
 examples/bitlashdemo/applet
 examples/*/applet

README-UNIX.md

@@ -8,6 +8,11 @@ Here are some notes on experimental Unix support for Bitlash.
 	- the basic functions work
 	- on OS X, numvar is 64 bits, so everything is 64 bits wide
 	- Makefile in src/ will build the binary as src/bin/bitlash
+        - Requires the ArduinoUnix library, which can be cloned from
+          https://github.com/matthijskooijman/ArduinoUnix. The makefile
+          normally looks for a directory called "ArduinoUnix" next to
+          the bitlash directory, but this can be changed by setting
+          ARDUINO_UNIX_PATH when calling make.
 	- there are some precompiled binaries in src/bin/
 
 - eeprom is simulated

bitlash.cpp

@@ -34,27 +34,16 @@
 
 
 ***/
-#if defined(ARDUINO) && ARDUINO >= 100
-  #include "Arduino.h"
-#else
-  #include "WProgram.h"
-#endif
-
-#ifdef UNIX_BUILD
-#include "src/bitlash-unix.c"
-//#else
-//#include "src/bitlash-arduino.c"
-#endif
-
-#include "src/bitlash-cmdline.c"
-#include "src/bitlash-eeprom.c"
-#include "src/bitlash-error.c"
-#include "src/bitlash-functions.c"
-#include "src/bitlash-builtins.c"
-#include "src/bitlash-interpreter.c"
-#include "src/bitlash-instream.c"
-#include "src/bitlash-parser.c"
-#include "src/bitlash-serial.c"
-#include "src/bitlash-taskmgr.c"
-#include "src/bitlash-api.c"
-#include "src/eeprom.c"
+
+#include "src/bitlash-cmdline.cpp"
+#include "src/bitlash-eeprom.cpp"
+#include "src/bitlash-error.cpp"
+#include "src/bitlash-functions.cpp"
+#include "src/bitlash-builtins.cpp"
+#include "src/bitlash-interpreter.cpp"
+#include "src/bitlash-instream.cpp"
+#include "src/bitlash-parser.cpp"
+#include "src/bitlash-serial.cpp"
+#include "src/bitlash-taskmgr.cpp"
+#include "src/bitlash-api.cpp"
+#include "src/eeprom.cpp"

bitlash.h

@@ -33,78 +33,10 @@
 	OTHER DEALINGS IN THE SOFTWARE.
 
 ***/
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "Arduino.h"
-	#define prog_char char PROGMEM
-	#define prog_uchar unsigned char PROGMEM
-#else
-	#include "WProgram.h"
-#endif
 
+#include "src/bitlash-public.h"
 
 // Un-comment the line below to expose all the internals
 // of the Bitlash core to your sketch.
 //
-//#include "src/bitlash.h"
-
-///////////////////////
-//	Start Bitlash, and give it cycles to do stuff
-//
-void initBitlash(unsigned long baud);	// start up and set baud rate
-void runBitlash(void);					// call this in loop(), frequently
-
-// Bitlash variables are of type "numvar"
-//
-typedef long int numvar;					// bitlash returns things of type numvar
-typedef unsigned long int unumvar;			// sometimes unsigned interpretation is best (like millis)
-
-
-///////////////////////
-//	Pass a command to Bitlash for interpretation
-//
-numvar doCommand(char *);				// execute a command from your sketch
-void doCharacter(char);					// pass an input character to the line editor
-
-///////////////////////
-//	Access to Numeric Variables
-//
-//	NOTE: access to variables a..z is via an index 0..25, not the variable names.  Got it?
-//
-numvar getVar(unsigned char);				// return value of bitlash variable.  id is [0..25] for [a..z]
-void assignVar(unsigned char, numvar);		// assign value to variable.  id is [0..25] for [a..z]
-numvar incVar(unsigned char);				// increment variable.  id is [0..25] for [a..z]
-
-
-///////////////////////
-//	Access to the Bitlash symbol table
-//
-// Lookup id and return TRUE if it exists
-//
-byte findscript(char *);		// returns TRUE if a script exists with this ID
-int getValue(char *key);			// return location of macro value in EEPROM or -1
-
-///////////////////////
-//	Add a user function to Bitlash
-//
-typedef numvar (*bitlash_function)(void);
-void addBitlashFunction(const char *, bitlash_function);
-numvar getarg(numvar);
-numvar isstringarg(numvar);
-numvar getstringarg(numvar which);
-
-///////////////////////
-//	Serial Output Capture
-//
-typedef void (*serialOutputFunc)(byte);
-byte serialIsOverridden(void);
-void setOutputHandler(serialOutputFunc);
-void setOutput(byte pin);
-void resetOutputHandler(void);
-numvar func_printf_handler(byte, byte);
-
-///////////////////////
-//	File functions
-//
-numvar sdcat(void);
-numvar sdwrite(char *filename, char *contents, byte append);
-numvar func_fprintf(void);
+//#include "src/bitlash-private.h"

examples/bitlash_rf/bitlash_rf.h

@@ -57,10 +57,6 @@
 //#define RADIO_VIRTUALWIRE
 	//#include "VirtualWire.h"
 
-// Arduino detector
-//
-#define ARDUINO_BUILD 1
-
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include "pkt.h"

src/Makefile

@@ -1,5 +1,16 @@
-all: 
-	gcc -pthread *.c -o bin/bitlash
+ARDUINO_UNIX_PATH ?= ../../ArduinoUnix
+
+include $(ARDUINO_UNIX_PATH)/Makefile.mk
+
+CFLAGS := -DUNIX_BUILD -pthread -I$(ARDUINO_UNIX_INCLUDE_PATH)
+LDFLAGS := -lstdc++ -pthread
+SOURCES := $(wildcard *.cpp) $(ARDUINO_UNIX_SOURCES)
+BINARY := bin/bitlash
+PREFIX := /usr/local
+BINPATH := $(PREFIX)/bin
+
+all:
+	gcc $(LDFLAGS) $(CFLAGS) $(SOURCES) -o $(BINARY)
 
 install:
-	sudo cp bin/bitlash /usr/local/bin/
+	sudo cp $(BINARY) $(BINPATH)

src/bitlash-api.c → src/bitlash-api.cpp

@@ -33,7 +33,7 @@
 	OTHER DEALINGS IN THE SOFTWARE.
 
 ***/
-#include "bitlash.h"
+#include "bitlash-private.h"
 
 
 // Exception handling state
@@ -45,19 +45,12 @@ jmp_buf env;
 //
 // doCommand: main entry point to execute a bitlash command
 //
-numvar doCommand(char *cmd) {
+numvar doCommand(const char *cmd) {
 	return execscript(SCRIPT_RAM, (numvar) cmd, 0);
 }
 
 
-void initBitlash(unsigned long baud) {
-
-#if defined(TINY_BUILD)
-	beginSerial(9600);
-#else
-	beginSerial(baud);
-#endif
-
+static void initBitlashInternal() {
 #if defined(ARM_BUILD)
 	eeinit();
 #endif
@@ -76,3 +69,17 @@ void initBitlash(unsigned long baud) {
 	initlbuf();
 }
 
+#ifndef DEFAULT_CONSOLE_ONLY
+void initBitlash(Stream& stream) {
+	blout = bloutdefault = blconsole = &stream;
+	initBitlashInternal();
+}
+#endif
+
+void initBitlash(unsigned long baud) {
+	#if defined(TINY_BUILD)
+	baud = 9600;
+	#endif
+	DEFAULT_CONSOLE.begin(baud);
+	initBitlashInternal();
+}

src/bitlash-builtins.c → src/bitlash-builtins.cpp

@@ -33,7 +33,7 @@
 	OTHER DEALINGS IN THE SOFTWARE.
 
 ***/
-#include "bitlash.h"
+#include "bitlash-private.h"
 
 /**********
 
@@ -87,7 +87,7 @@ const prog_char builtin_table[] PROGMEM = {
 
 
 
-byte findbuiltin(char *name) {
+byte findbuiltin(const char *name) {
 const prog_char *wordlist = builtin_table;
 
 	while (pgm_read_byte(wordlist)) {

src/bitlash-cmdline.c → src/bitlash-cmdline.cpp

@@ -33,7 +33,7 @@
 	OTHER DEALINGS IN THE SOFTWARE.
 
 ***/
-#include "bitlash.h"
+#include "bitlash-private.h"
 
 
 // Serial command line buffer
@@ -106,7 +106,7 @@ void initlbuf(void) {
 	prompt();
 
 	// flush any pending serial input
-	while (serialAvailable()) serialRead();
+	while (blconsole->read() >= 0) /* nothing */;
 }
 
 
@@ -125,7 +125,7 @@ byte putlbuf(char c) {
 
 void pointToError(void) {
 	if (fetchtype == SCRIPT_RAM) {
-		int i = (char *) fetchptr - lbuf;
+		int i = (const char *) fetchptr - lbuf;
 		if ((i < 0) || (i >= LBUFLEN)) return;
 		speol();
 		while (i-- >= 0) spb('-');
@@ -197,7 +197,7 @@ void doCharacter(char c) {
 void runBitlash(void) {
 
 	// Pipe the serial input into the command handler
-	if (serialAvailable()) doCharacter(serialRead());
+	if (blconsole->available()) doCharacter(blconsole->read());
 
 	// Background macro handler: feed it one call each time through
 	runBackgroundTasks();