Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
166de9e
test zfx_script
sonicyouth98 Apr 27, 2022
7176db4
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 Apr 28, 2022
849cfc4
test2
sonicyouth98 Apr 28, 2022
e6b9850
test Lex
sonicyouth98 Apr 29, 2022
b711402
creat A test Project PiLeiFX
sonicyouth98 May 3, 2022
504ba12
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 4, 2022
7b10758
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 6, 2022
8d8cd0f
PiLeiFX
sonicyouth98 May 7, 2022
7e560ca
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 7, 2022
4f3eb6c
fix Lexical
sonicyouth98 May 8, 2022
302a043
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 9, 2022
9b91d72
continue cihou zfx
sonicyouth98 May 10, 2022
ab089e6
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 10, 2022
34354ba
cihouzfx
sonicyouth98 May 10, 2022
ea06fde
cihou ast parser
sonicyouth98 May 11, 2022
aff7d76
fix immature symbol table
sonicyouth98 May 12, 2022
063ef38
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 16, 2022
f2c0abc
want to add ctx Module
sonicyouth98 May 16, 2022
a29cb91
Merge branch 'zfx_script' of https://github.com/sonicyouth98/zeno int…
sonicyouth98 May 16, 2022
3da4fe7
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 23, 2022
36e90b0
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 May 24, 2022
844d323
next needs to be IRBuilder and some basic optimization
sonicyouth98 May 26, 2022
febc3d0
change code structure
sonicyouth98 May 31, 2022
54d5957
Merge branch 'zenustech:master' into zfx_script
sonicyouth98 Jun 7, 2022
eaf06e7
continue
sonicyouth98 Jun 11, 2022
10fcb91
add numericeval
sonicyouth98 Jun 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions projects/ZenoFX/ZFX/Lexical.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,27 @@

namespace zfx {

inline char opchars[] = "+-*/%=(),.;<>!&|^?:";
inline std::set<std::string> opstrs = {
//inline char opchars[] = "+-*/%=(),.;<>!&|^?:";
//
enum class Op {
'+';
'-'

};

/*inline std::set<std::string> opstrs = {
"(", ")", ",", ".", ";",
"+", "-", "*", "/", "%", "=",
"+=", "-=", "*=", "/=", "%=",
"==", "!=", "<", "<=", ">", ">=",
"&", "&!", "|", "^", "!", "?", ":",
};
*/
enum class Seprator {
'(',


};

inline bool is_literial_atom(std::string const &s) {
if (!s.size()) return false;
Expand Down
3 changes: 2 additions & 1 deletion projects/ZenoFX/ppw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#include <zfx/x64.h>
#include <cassert>
#include "dbg_printf.h"

//this is git test
//this is git test2
namespace {

static zfx::Compiler compiler;
Expand Down