cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Unicode stuff (#26670)

Browse Source 
* Removes Unicode stuff

* Fixes capitalize() and examine

* Not important but how did this happen

* No more emoji in say or HTML in me

* Clarifies comment

* Better HTML sanitization

* Rebuilds dll

* Fixes some browser windows

* Fixes telecomms scripts (lazily)
This is the easy way out, but could probably be made faster by doing the byte counting ourselves
This commit is contained in:
Exxion
2020-06-28 08:22:42 -04:00
committed by GitHub
parent a98a4b0000
commit 641009059e
32 changed files with 67 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/modules/scripting/Scanner/Scanner.dm
View File

@@ -26,7 +26,7 @@
Loads source code.
*/
/datum/n_Scanner/proc/LoadCode(var/c)
code=strict_ascii(c)
code = c
/*
Proc: LoadCodeFromFile
@@ -109,10 +109,10 @@
/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++)
for(, src.codepos <= length_char(code), src.codepos++)
var/char = copytext(code, codepos, codepos + 1)
var/nextchar = copytext(code, codepos + 1, codepos + 2)
var/char = copytext_char(code, codepos, codepos + 1)
var/nextchar = copytext_char(code, codepos + 1, codepos + 2)
if(char == "\n")
line++
linepos = codepos
@@ -155,12 +155,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 <= length_char(code), codepos++)//codepos to length(code))
var/char = copytext_char(code, codepos, codepos + 1)
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 = copytext_char(code, codepos, codepos+1)
switch(char)
if("\\") //Double backslash
buf += "\\"
@@ -190,12 +190,12 @@
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 = copytext_char(code, codepos, codepos + 1)
var/buf
while(!delim.Find(char) && codepos <= length(code))
while(!delim.Find(char) && codepos <= length_char(code))
buf += char
char = copytext(code, ++codepos, codepos + 1)
char = copytext_char(code, ++codepos, codepos + 1)
codepos-- //allow main Scan() proc to read the delimiter
if(options.keywords.Find(buf))
return new/datum/token/keyword(buf, line, COL)
@@ -207,14 +207,14 @@
Reads a symbol into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadSymbol()
var/char=copytext(code, codepos, codepos + 1)
var/char=copytext_char(code, codepos, codepos + 1)
var/buf
while(options.symbols.Find(buf + char))
buf += char
if(++codepos > length(code))
if(++codepos > length_char(code))
break
char = copytext(code, codepos, codepos + 1)
char = copytext_char(code, codepos, codepos + 1)
codepos-- //allow main Scan() proc to read the next character
return new /datum/token/symbol(buf, line, COL)
@@ -224,7 +224,7 @@
Reads a number into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadNumber()
var/char = copytext(code, codepos, codepos + 1)
var/char = copytext_char(code, codepos, codepos + 1)
var/buf
var/dec = 0
@@ -234,7 +234,7 @@
buf += char
codepos++
char = copytext(code, codepos, codepos + 1)
char = copytext_char(code, codepos, codepos + 1)
var/datum/token/number/T = new(buf, line, COL)
if(isnull(text2num(buf)))
@@ -250,8 +250,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 = copytext_char(code, codepos, codepos + 1)
var/nextchar = copytext_char(code, codepos + 1, codepos + 2)
var/charstring = char + nextchar
var/comm = 1
// 1: single-line comment
@@ -263,23 +263,23 @@
comm = 2 // starts a multi-line comment
while(comm)
if(++codepos > length(code))
if(++codepos > length_char(code))
break
if(expectedend) // ending statement expected...
char = copytext(code, codepos, codepos + 1)
char = copytext_char(code, codepos, codepos + 1)
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 = copytext_char(code, codepos, codepos + 1)
if(char == "*")
expectedend = 1
continue
else
char = copytext(code, codepos, codepos + 1)
char = copytext_char(code, codepos, codepos + 1)
if(char == "\n")
comm = 0
break