kiss-lang/kiss
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

pass the original ReaderExp code to process()

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-12-11 10:11:51 -06:00
parent da26e94c59
commit 6ec40da338
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/kiss/Kiss.hx
View File

@@ -786,9 +786,9 @@ class Kiss {
}
var startPosition = stream.position();
var loadedExps = [];
Reader.readAndProcess(stream, k, (nextExp) -> {
Reader.readAndProcess(stream, k, (nextExp, str) -> {
#if test
Sys.println(nextExp.def.toString());
Sys.println(str);
#end
// readerExpToHaxeExpr must be called to process readermacro, alias, and macro definitions

40
src/kiss/Reader.hx
View File

@@ -426,28 +426,35 @@ class Reader {
}
}
static function _startOfFile(stream:Stream, k:HasReadTables, process:(ReaderExp,Void->Void)->Void, ?cc:Void->Void) {
static function _startOfFile(stream:Stream, k:HasReadTables, process:(ReaderExp,String,Void->Void)->Void, ?cc:Void->Void) {
if (cc == null) cc = () -> {};
var startOfFileMacro = chooseReadFunction(stream, k.startOfFileReadTable);
if (startOfFileMacro != null) {
var pos = stream.position();
var v = startOfFileMacro(stream, k);
if (v != null)
process(v.withPos(pos), cc);
var v = null;
var str = stream.recordTransaction(Both, () -> {
v = startOfFileMacro(stream, k);
});
if (v != null) {
process(v.withPos(pos), str, cc);
}
} else {
cc();
}
}
static function _endOfFile(stream:Stream, k:HasReadTables, process:(ReaderExp,Void->Void)->Void, ?cc:Void->Void){
static function _endOfFile(stream:Stream, k:HasReadTables, process:(ReaderExp,String,Void->Void)->Void, ?cc:Void->Void){
if (cc == null) cc = () -> {};
var endOfFileMacro = chooseReadFunction(stream, k.endOfFileReadTable, true);
if (endOfFileMacro != null) {
trace('end of file macro!');
var pos = stream.position();
var v = endOfFileMacro(stream, k);
var v = null;
var str = stream.recordTransaction(Both, () -> {
v = endOfFileMacro(stream, k);
});
if (v != null){
process(v.withPos(pos), cc);
process(v.withPos(pos), str, cc);
return true;
}
}
@@ -460,14 +467,17 @@ class Reader {
return false;
}
static function _nextNormalExp(stream:Stream, k:HasReadTables, process:(ReaderExp,Void->Void)->Void, ?cc:Void->Void) {
static function _nextNormalExp(stream:Stream, k:HasReadTables, process:(ReaderExp,String,Void->Void)->Void, ?cc:Void->Void) {
if (cc == null) cc = () -> {};
var nextExp = Reader._read(stream, k);
var nextExp = null;
var str = stream.recordTransaction(Both, () -> {
nextExp = Reader._read(stream, k);
});
// The last expression might be a comment, in which case None will be returned
switch (nextExp) {
case Some(nextExp):
process(nextExp, cc);
process(nextExp, str, cc);
case None:
stream.dropWhitespace(); // If there was a comment, drop whitespace that comes after
}
@@ -477,7 +487,7 @@ class Reader {
Read all the expressions in the given stream, processing them one by one while reading.
They can't be read all at once because some expressions change the Readtable state
**/
public static function readAndProcessCC(stream:Stream, k:HasReadTables, process:(ReaderExp, cc:Void->Void) -> Void, nested = false) {
public static function readAndProcessCC(stream:Stream, k:HasReadTables, process:(ReaderExp, String, cc:Void->Void) -> Void, nested = false) {
_handleNesting(stream, nested);
function afterStartOfFile():Void {
@@ -492,9 +502,9 @@ class Reader {
_startOfFile(stream, k, process, afterStartOfFile);
}
public static function readAndProcess(stream:Stream, k:HasReadTables, process:(ReaderExp) -> Void, nested = false) {
var wrappedProcess = (exp, cc) -> {
process(exp);
public static function readAndProcess(stream:Stream, k:HasReadTables, process:(ReaderExp,String) -> Void, nested = false) {
var wrappedProcess = (exp, str, cc) -> {
process(exp, str);
};
_handleNesting(stream, nested);
_startOfFile(stream, k, wrappedProcess);

3
src/kiss/Stream.hx
View File

@@ -159,9 +159,8 @@ class Stream {
}
public function putBackString(s:String) {
// I don't know what should happen when putBackString() is used while recording. So for now, it is an error.
if (recordingType != Neither) {
error(this, "Undefined behavior: calling putBackString() while in the middle of recording a stream transaction");
recording = recording.substr(0, recording.length - s.length);
}
#if macro
Kiss.measure("Stream.putBackString", () -> {