cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tcomms Optimization p1 (still broke)

Browse Source
This commit is contained in:
tigercat2000
2018-04-04 09:20:37 -07:00
parent 8fae4e380f
commit 354cf75cb7
7 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/scripting/Implementations/Telecomms.dm
+13 -5
View File
@@ -24,14 +24,22 @@
interpreter.GC()
//temp
/datum/TCS_Compiler
var/datum/n_scriptOptions/nS_Options/options
var/datum/n_Scanner/nS_Scanner/scanner
var/list/tokens
var/datum/n_Parser/nS_Parser/parser
var/datum/node/BlockDefinition/GlobalBlock/program
/* -- Compile a raw block of text -- */
/datum/TCS_Compiler/proc/Compile(code as message)
var/datum/n_scriptOptions/nS_Options/options = new()
var/datum/n_Scanner/nS_Scanner/scanner = new(code, options)
var/list/tokens = scanner.Scan()
var/datum/n_Parser/nS_Parser/parser = new(tokens, options)
var/datum/node/BlockDefinition/GlobalBlock/program = parser.Parse()
options = new()
scanner = new(code, options)
tokens = scanner.Scan()
parser = new(tokens, options)
program = parser.Parse()
var/list/returnerrors = list()
code/modules/scripting/Interpreter/Interpreter.dm
+2
View File
@@ -184,6 +184,8 @@ Runs each statement in a block of code.
else
RaiseError(new/datum/runtimeError/UnknownInstruction())
CHECK_TICK
if(status)
break
code/modules/scripting/Options.dm
+4 -3
View File
@@ -36,11 +36,12 @@ File: Options
if(!CanStartID(id)) //don't need to grab first char in id, since text2ascii does it automatically
return 0
if(length(id) == 1)
var/list/charmap = string2charlist(id)
if(charmap.len == 1)
return 1
for(var/i=2 to length(id))
if(!IsValidIDChar(copytext(id, i, i + 1)))
for(var/i = 2 to charmap.len)
if(!IsValidIDChar(charmap[i]))
return 0
return 1
code/modules/scripting/Scanner/Scanner.dm
+25 -21
View File
@@ -7,6 +7,7 @@
*/
/datum/n_Scanner
var/code
var/list/charlist
/*
Var: errors
A list of fatal errors found by the scanner. If there are any items in this list, then it is not safe to parse the returned tokens.
@@ -27,6 +28,7 @@
*/
/datum/n_Scanner/proc/LoadCode(var/c)
code=c
charlist=string2charlist(code)
/*
Proc: LoadCodeFromFile
@@ -109,15 +111,14 @@
/datum/n_Scanner/nS_Scanner/Scan() //Creates a list of tokens from source code
var/list/tokens = new
for(, src.codepos <= length(code), src.codepos++)
var/char = copytext(code, codepos, codepos + 1)
var/nextchar = copytext(code, codepos + 1, codepos + 2)
for(, src.codepos <= charlist.len, src.codepos++)
var/char = charlist[codepos]
var/nextchar = TCOMMS_SAFE_INDEX(charlist, codepos + 1)
if(char == "\n")
line++
linepos = codepos
if(ignore.Find(char))
if(char in ignore)
continue
else if(char == "/" && (nextchar == "*" || nextchar == "/"))
@@ -139,6 +140,7 @@
else if(options.symbols.Find(char))
tokens += ReadSymbol()
CHECK_TICK
codepos = initial(codepos)
line = initial(line)
@@ -155,12 +157,12 @@
*/
/datum/n_Scanner/nS_Scanner/proc/ReadString(start)
var/buf
for(, codepos <= length(code), codepos++)//codepos to length(code))
var/char = copytext(code, codepos, codepos + 1)
for(, codepos <= charlist.len, codepos++)//codepos to length(code))
var/char = charlist[codepos]
switch(char)
if("\\") //Backslash (\) encountered in string
codepos++ //Skip next character in string, since it was escaped by a backslash
char = copytext(code, codepos, codepos+1)
char = TCOMMS_SAFE_INDEX(charlist, codepos)
switch(char)
if("\\") //Double backslash
buf += "\\"
@@ -190,12 +192,14 @@
Reads characters separated by an item in <delim> into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadWord()
var/char = copytext(code, codepos, codepos + 1)
var/char = charlist[codepos]
var/buf
while(!delim.Find(char) && codepos <= length(code))
while(!delim.Find(char))
buf += char
char = copytext(code, ++codepos, codepos + 1)
if(++codepos > length(code)) break
char = charlist[codepos]
codepos-- //allow main Scan() proc to read the delimiter
if(options.keywords.Find(buf))
return new/datum/token/keyword(buf, line, COL)
@@ -207,13 +211,13 @@
Reads a symbol into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadSymbol()
var/char=copytext(code, codepos, codepos + 1)
var/char = charlist[codepos]
var/buf
while(options.symbols.Find(buf + char))
buf += char
if(++codepos > length(code)) break
char = copytext(code, codepos, codepos + 1)
char = charlist[codepos]
codepos-- //allow main Scan() proc to read the next character
return new /datum/token/symbol(buf, line, COL)
@@ -223,7 +227,7 @@
Reads a number into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadNumber()
var/char = copytext(code, codepos, codepos + 1)
var/char = charlist[codepos]
var/buf
var/dec = 0
@@ -233,7 +237,7 @@
buf += char
codepos++
char = copytext(code, codepos, codepos + 1)
char = TCOMMS_SAFE_INDEX(charlist, codepos)
var/datum/token/number/T = new(buf, line, COL)
if(isnull(text2num(buf)))
@@ -249,8 +253,8 @@
*/
/datum/n_Scanner/nS_Scanner/proc/ReadComment()
var/char = copytext(code, codepos, codepos + 1)
var/nextchar = copytext(code, codepos + 1, codepos + 2)
var/char = charlist[codepos]
var/nextchar = TCOMMS_SAFE_INDEX(charlist, codepos + 1)
var/charstring = char + nextchar
var/comm = 1
// 1: single-line comment
@@ -262,23 +266,23 @@
comm = 2 // starts a multi-line comment
while(comm)
if(++codepos > length(code))
if(++codepos > charlist.len)
break
if(expectedend) // ending statement expected...
char = copytext(code, codepos, codepos + 1)
char = charlist[codepos]
if(char == "/") // ending statement found - beak the comment
comm = 0
break
if(comm == 2)
// multi-line comments are broken by ending statements
char = copytext(code, codepos, codepos + 1)
char = charlist[codepos]
if(char == "*")
expectedend = 1
continue
else
char = copytext(code, codepos, codepos + 1)
char = charlist[codepos]
if(char == "\n")
comm = 0
break
code/modules/scripting/__defines.dm
+1
View File
@@ -0,0 +1 @@
#define TCOMMS_SAFE_INDEX(list, index) list.len > index ? list[index] : null