sage
/
pebblisp
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better stringing.

This commit is contained in:
Sage Vaillancourt 2022-04-20 17:01:02 -04:00 committed by Sage Vaillancourt
parent d825ca3fe2
commit 9d2effe206
4 changed files with 96 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/examples/forbble.pbl
View File

@ -10,7 +10,7 @@
)))
(def pop (fn ()
"Remove the top of the stack"
"Remove and print the top of the stack"
(if (> (len stack) 0) (
(def top (at 0 stack))
(set stack (rest stack))
@ -18,6 +18,13 @@
) (prnl "pop: STACK EMPTY"))
))
(def drop (fn ()
"Remove the top of the stack"
(if (> (len stack) 0) (
(set stack (rest stack))
) (prnl "pop: STACK EMPTY"))
))
(def twop (fn (op)
"Apply the given operation to the top two stack elements" (
(if (< (len stack) 2) (prnl "stack too small!") (
@ -92,6 +99,7 @@
(h-insert operations name op)
)))
(add-op "cls" '(sys "clear"))
(add-op "drop" '(drop))
(add-op "over" '(over))
(add-op "rot" '(rot))
(add-op "dup" '(dup))

14
src/object.c
View File

@ -739,22 +739,20 @@ inline Object nullTerminated(const char* string)
inline Object stringFromSlice(const char* string, int len)
{
#ifdef STANDALONE
//eprintf("ay: %s\n", string);
Object o = withLen(len, TYPE_STRING);
int c = 0;
for (int i = 0; i < len; i++) {
if (string[i] == '\\') {
switch (string[i + 1]) {
case '"':
o.string[c] = '"';
break;
case '\\':
o.string[c] = '\\';
i++;
switch (string[i]) {
case 'n':
o.string[c] = '\n';
break;
default:
o.string[c] = string[i + 1];
o.string[c] = string[i];
break;
}
i++;
} else {
o.string[c] = string[i];
}

5
src/tests.sh
View File

@ -49,7 +49,7 @@ pass() {
fail() {
echo -n "X"
FAIL_OUTPUT="$FAIL_OUTPUT $1 FAILED\n When running \"$2\""
FAIL_OUTPUT="$FAIL_OUTPUT $1 FAILED\n When running $2"
((FAILS++))
((TOTAL_FAILS++))
}
@ -115,6 +115,9 @@ check "String Inequality" '(= "Beans" "Bean" )' "F"
check "Null Inequality" '(= "Beans" "" )' "F"
title "Complex Strings"
check "Escaping Quotes" '"\"Hello\""' '"Hello"'
check "Escaping Backslash" '"\\Hello\\"' '\Hello\'
check "Escaping Many" '"\\\"\\\\\\Hello\\\"\\\\\\"' '\"\\\Hello\"\\\'
check "Triple Quoting" '"""Hello"""' 'Hello'
check "Triple Quoting With Quotes" '"""My name is "yoink"."""' 'My name is "yoink".'

107
src/tokens.c
View File

@ -43,6 +43,11 @@ void buildErrFromInput(struct Error* err, enum errorCode code, int i, const char
strncpy(err->context, &input[start], ERR_LEN);
}
void collectSymbol(const char* input, int* i, int* length);
void processString(const char* input, struct Error* err, struct Slice* slices, int slice, int* i, int* lineNumber,
int* length);
struct Slice* nf_tokenize(const char* input, struct Error* err)
{
if (!input) {
@ -94,40 +99,14 @@ struct Slice* nf_tokenize(const char* input, struct Error* err)
}
continue;
} else if (input[i] == '"') {
if (input[i + 1] == '"' && input[i + 2] == '"') {
// Triple-quoted block
i += 2;
slices[slice].text += 2;
for (;;) {
i++;
if (input[i] == '"' && input[i + 1] == '"' && input[i + 2] == '"') {
break;
processString(input, err, slices, slice, &i, &lineNumber, &length);
} else {
collectSymbol(input, &i, &length);
}
if (input[i] == '\n') {
lineNumber++;
}
length++;
if (input[i] == '\0' || input[i + 1] == '\0' || input[i + 2] == '\0') {
buildErrFromInput(err, UNEXPECTED_EOF, i, input);
//free(slices);
if (err->context != NULL) {
return NULL;
}
}
} else {
// Simple string
while ((input[++i] != '"' || input[i - 1] == '\\') && input[i] != '\0') {
if (input[i] == '\n') {
lineNumber++;
}
length++;
}
}
i++;
} else {
while (!isWhitespace(input[++i]) && !isSingle(input[i]) && input[i] != '"' && input[i] != '\0') {
length++;
}
}
slices[slice].length = length;
slice++;
@ -147,3 +126,69 @@ struct Slice* nf_tokenize(const char* input, struct Error* err)
return allocated;
}
void singleQuotedString(const char* input, int* i, int* lineNumber, int* length);
void tripleQuotedString(const char* input, struct Error* err, struct Slice* slice, int* i, int* lineNumber,
int* length);
void processString(const char* input, struct Error* err, struct Slice* slices, int slice, int* i, int* lineNumber,
int* length)
{
if (input[(*i) + 1] == '"' && input[(*i) + 2] == '"') {
tripleQuotedString(input, err, &slices[slice], i, lineNumber, length);
} else {
singleQuotedString(input, i, lineNumber, length);
}
(*i)++;
}
void collectSymbol(const char* input, int* i, int* length)
{
while (!isWhitespace(input[++(*i)]) && !isSingle(input[(*i)]) && input[(*i)] != '"' && input[(*i)] != '\0') {
(*length)++;
}
}
void tripleQuotedString(const char* input, struct Error* err, struct Slice* slice, int* i, int* lineNumber, int* length)
{
// Skip past the extra opening quotes
(*i) += 2;
slice->text += 2;
for (;;) {
(*i)++;
const int c = *i;
if (input[c] == '"' && input[c + 1] == '"' && input[c + 2] == '"') {
break;
}
if (input[c] == '\n') {
(*lineNumber)++;
}
(*length)++;
if (input[c] == '\0' || input[c + 1] == '\0' || input[c + 2] == '\0') {
buildErrFromInput(err, UNEXPECTED_EOF, c, input);
return;
}
}
}
void singleQuotedString(const char* input, int* i, int* lineNumber, int* length)
{
while (input[++(*i)] != '\0') {
if (input[(*i)] == '"') {
int backslashes = 0;
while (input[((*i) - 1) - backslashes] == '\\') {
backslashes++;
}
// \\\" => Odd number of backslashes, quote IS escaped
// \\" => Even number of backslashes, quote is NOT escaped
if (backslashes % 2 == 0) {
break;
}
} else if (input[(*i)] == '\n') {
(*lineNumber)++;
}
(*length)++;
}
}