stepus53/psil
1
0
Fork 0
mirror of https://github.com/usatiuk/psil.git synced 2025-10-28 10:47:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

even better parser

Browse Source
This commit is contained in:
Stepan Usatiuk
2023-12-26 13:41:14 +01:00
parent 27cbe8a200
commit a0febfba0e
5 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vm/CMakeLists.txt
View File

@@ -2,6 +2,6 @@ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_library(vm src/VM.cpp src/Cell.cpp add_library(vm src/VM.cpp src/Cell.cpp
src/Parser.cpp src/SParser.cpp src/MemoryContext.cpp src/ConsUtils.cpp) src/Parser.cpp src/MemoryContext.cpp src/ConsUtils.cpp)
target_include_directories(vm PUBLIC includes) target_include_directories(vm PUBLIC includes)

14
src/vm/includes/SParser.h
View File

@@ -1,14 +0,0 @@
//
// Created by Stepan Usatiuk on 25.12.2023.
//
#ifndef PSIL_SPARSER_H
#define PSIL_SPARSER_H
class SParser {
// SParser()
};
#endif//PSIL_SPARSER_H

22
src/vm/src/Parser.cpp
View File

@@ -4,6 +4,7 @@
#include "Parser.h" #include "Parser.h"
#include <format>
#include <ranges> #include <ranges>
#include <stack> #include <stack>
@@ -62,10 +63,23 @@ std::string_view Parser::Tokenizer::peek() const {
} }
void Parser::Tokenizer::load(std::string_view input) { void Parser::Tokenizer::load(std::string_view input) {
for (const auto &w: input | std::views::split(' ') | std::views::transform([](auto &&rng) { std::string_view::size_type curpos = input.find_first_not_of(' ');
return std::string_view(&*rng.begin(), std::ranges::distance(rng));
})) { static const std::string alnum = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
_tokens.emplace(w); static const std::string special = "().";
while (curpos != std::string_view::npos) {
if (alnum.find(input.at(curpos)) != std::string::npos) {
std::string_view::size_type end = input.find_first_not_of(alnum, curpos);
_tokens.emplace(input.cbegin() + curpos, input.cbegin() + end);
curpos = end;
} else if (special.find(input.at(curpos)) != std::string::npos) {
_tokens.emplace(1, input.at(curpos));
curpos++;
} else {
throw std::invalid_argument("Unexpected symbol " + std::string(1, input.at(curpos)));
}
curpos = input.find_first_not_of(' ', curpos);
} }
} }

5
src/vm/src/SParser.cpp
View File

@@ -1,5 +0,0 @@
//
// Created by Stepan Usatiuk on 25.12.2023.
//
#include "SParser.h"

6
test/vm/VMWithParserTest.cpp
View File

@@ -10,7 +10,7 @@ TEST(VMWithParserTest, BasicHello) {
MemoryContext mc; MemoryContext mc;
VM vm(ssin, ssout); VM vm(ssin, ssout);
Parser parser; Parser parser;
parser.loadStr("( LDC 104 PUTCHAR STOP )"); parser.loadStr("(LDC 104 PUTCHAR STOP)");
vm.loadControl(parser.parseExpr()); vm.loadControl(parser.parseExpr());
vm.run(); vm.run();
} }
@@ -26,7 +26,7 @@ TEST(VMWithParserTest, BasicBranch) {
VM vm(ssin, ssout); VM vm(ssin, ssout);
Parser parser; Parser parser;
parser.loadStr( parser.loadStr(
"( LDC 1 SEL ( LDC 10 PUTNUM JOIN ) ( LDC 20 PUTNUM JOIN ) LDC 0 SEL ( LDC 30 PUTNUM JOIN ) ( LDC 40 PUTNUM JOIN ) STOP )"); "(LDC 1 SEL (LDC 10 PUTNUM JOIN) (LDC 20 PUTNUM JOIN) LDC 0 SEL (LDC 30 PUTNUM JOIN) (LDC 40 PUTNUM JOIN) STOP)");
vm.loadControl(parser.parseExpr()); vm.loadControl(parser.parseExpr());
vm.run(); vm.run();
} }
@@ -41,7 +41,7 @@ TEST(VMWithParserTest, BasicFunction) {
MemoryContext mc; MemoryContext mc;
VM vm(ssin, ssout); VM vm(ssin, ssout);
Parser parser; Parser parser;
parser.loadStr("( NIL LDC 1 CONS LDC 2 CONS LDF ( LD ( 1 . 1 ) LD ( 1 . 2 ) ADD RET ) AP PUTNUM STOP )"); parser.loadStr("(NIL LDC 1 CONS LDC 2 CONS LDF (LD (1 . 1) LD (1.2) ADD RET) AP PUTNUM STOP)");
vm.loadControl(parser.parseExpr()); vm.loadControl(parser.parseExpr());
vm.run(); vm.run();
} }