Improved the lexer to be functionally equlivant to the C++ version and ported the tests, commented out the dot generation from Import as it was slowing things down significantly.

This commit is contained in:
Nathan Braswell
2015-06-29 01:03:51 -04:00
parent b81abee459
commit 91f801d14f
5 changed files with 90 additions and 12 deletions

View File

@@ -1,12 +1,22 @@
import string
fun symbol(dataIn: char*, nameIn: char*, terminalIn: bool): symbol {
var toRet.construct(string::string(dataIn), string::string(nameIn), terminalIn): symbol
fun symbol(nameIn: char*, terminalIn: bool): symbol {
var toRet.construct(string::string(nameIn), terminalIn, string::string("no_value")): symbol
return toRet
}
fun symbol(dataIn: string::string, nameIn: string::string, terminalIn: bool): symbol {
var toRet.construct(dataIn, nameIn, terminalIn): symbol
fun symbol(nameIn: string::string, terminalIn: bool): symbol {
var toRet.construct(nameIn, terminalIn, string::string("no_value")): symbol
return toRet
}
fun symbol(nameIn: char*, terminalIn: bool, dataIn: char*): symbol {
var toRet.construct(string::string(nameIn), terminalIn, string::string(dataIn)): symbol
return toRet
}
fun symbol(nameIn: string::string, terminalIn: bool, dataIn: string::string): symbol {
var toRet.construct(nameIn, terminalIn, dataIn): symbol
return toRet
}
@@ -20,10 +30,10 @@ obj symbol {
name.construct()
return this
}
fun construct(dataIn: string::string, nameIn: string::string, terminalIn: bool): symbol* {
data.construct(dataIn)
fun construct(nameIn: string::string, terminalIn: bool, dataIn: string::string): symbol* {
name.construct(nameIn)
terminal = terminalIn
data.construct(dataIn)
return this
}
fun destruct() {