Eatswap
/
DragonLisp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Eatswap:7f79bd776809dca5c7bcca89686d3e8e2d048a20
Branches Tags
Eatswap:master
..
compare: Eatswap:568113ad84522c97f12c0c13f3b5ecc43f3991a5
Branches Tags
Eatswap:master

No commits in common. "7f79bd776809dca5c7bcca89686d3e8e2d048a20" and "568113ad84522c97f12c0c13f3b5ecc43f3991a5" have entirely different histories.
7f79bd7768 ... 568113ad84

2 changed files with 30 additions and 46 deletions
Show Stats Expand all files Collapse all files

6
DragonLisp.l
View File

@ -59,7 +59,6 @@ do [dD][oO]
aref [aA][rR][eE][fF] aref [aA][rR][eE][fF]
t [tT] t [tT]
nil [nN][iI][lL] nil [nN][iI][lL]
return [rR][eE][tT][uU][rR][nN]
makearray [mM][aA][kK][eE][-][aA][rR][rR][aA][yY] makearray [mM][aA][kK][eE][-][aA][rR][rR][aA][yY]
defconstant [dD][eE][fF][cC][oO][nN][sS][tT][aA][nN][tT] defconstant [dD][eE][fF][cC][oO][nN][sS][tT][aA][nN][tT]
@ -328,11 +327,6 @@ defconstant [dD][eE][fF][cC][oO][nN][sS][tT][aA][nN][tT]
return token::TOKEN_NIL; return token::TOKEN_NIL;
}; };
{return} {
std::printf("Scanned return\n");
return token::TOKEN_RETURN;
};
{makearray} { {makearray} {
std::printf("Scanned makearray\n"); std::printf("Scanned makearray\n");
return token::TOKEN_MAKE_ARRAY; return token::TOKEN_MAKE_ARRAY;

70
DragonLisp.y
View File

@ -10,7 +10,6 @@
#include <typeinfo> #include <typeinfo>
#include "token.h" #include "token.h"
#include "AST.h"
namespace DragonLisp { namespace DragonLisp {
class DLDriver; class DLDriver;
@ -87,7 +86,6 @@ namespace DragonLisp {
AREF "aref" AREF "aref"
T "t" T "t"
NIL "nil" NIL "nil"
RETURN "return"
MAKE_ARRAY "make-array" MAKE_ARRAY "make-array"
DEFCONSTANT "defconstant" DEFCONSTANT "defconstant"
; ;
@ -98,14 +96,6 @@ namespace DragonLisp {
%token <std::string> STRING "string" %token <std::string> STRING "string"
%token <std::string> IDENTIFIER "identifier" %token <std::string> IDENTIFIER "identifier"
%type <DragonLisp::Token> var-op-tokens
%type <DragonLisp::Token> lval-op-tokens
%type <DragonLisp::Token> unary-tokens
%type <DragonLisp::Token> binary-tokens
%type <DragonLisp::Token> list-tokens
%type <std::unique_ptr<DragonLisp::ExprAST>> R-Value
%define parse.error verbose %define parse.error verbose
%start S %start S
@ -178,9 +168,9 @@ S-Expr-var-op
; ;
var-op-tokens var-op-tokens
: DEFVAR { std::printf("Parsed var-op-tokens -> DEFVAR\n"); $$ = DragonLisp::Token::DEFVAR; } : DEFVAR { std::printf("Parsed var-op-tokens -> DEFVAR\n"); }
| SETQ { std::printf("Parsed var-op-tokens -> SETQ\n"); $$ = DragonLisp::Token::SETQ; } | SETQ { std::printf("Parsed var-op-tokens -> SETQ\n"); }
| DEFCONSTANT { std::printf("Parsed var-op-tokens -> DEFCONSTANT\n"); $$ = DragonLisp::Token::DEFCONSTANT; } | DEFCONSTANT { std::printf("Parsed var-op-tokens -> DEFCONSTANT\n"); }
; ;
S-Expr-Lval-op S-Expr-Lval-op
@ -188,9 +178,9 @@ S-Expr-Lval-op
; ;
lval-op-tokens lval-op-tokens
: SETF { std::printf("Parsed lval-op-tokens -> SETF\n"); $$ = DragonLisp::Token::SETF; } : SETF { std::printf("Parsed lval-op-tokens -> SETF\n"); }
| INCF { std::printf("Parsed lval-op-tokens -> INCF\n"); $$ = DragonLisp::Token::INCF; } | INCF { std::printf("Parsed lval-op-tokens -> INCF\n"); }
| DECF { std::printf("Parsed lval-op-tokens -> DECF\n"); $$ = DragonLisp::Token::DECF; } | DECF { std::printf("Parsed lval-op-tokens -> DECF\n"); }
; ;
S-Expr-unary S-Expr-unary
@ -198,9 +188,9 @@ S-Expr-unary
; ;
unary-tokens unary-tokens
: NOT { std::printf("Parsed unary-tokens -> NOT\n"); $$ = DragonLisp::Token::NOT; } : NOT { std::printf("Parsed unary-tokens -> NOT\n"); }
| PRINT { std::printf("Parsed unary-tokens -> PRINT\n"); $$ = DragonLisp::Token::PRINT; } | PRINT { std::printf("Parsed unary-tokens -> PRINT\n"); }
| MAKE_ARRAY { std::printf("Parsed unary-tokens -> MAKE_ARRAY\n"); $$ = DragonLisp::Token::MAKE_ARRAY; } | MAKE_ARRAY { std::printf("Parsed unary-tokens -> MAKE_ARRAY\n"); }
; ;
S-Expr-binary S-Expr-binary
@ -208,13 +198,13 @@ S-Expr-binary
; ;
binary-tokens binary-tokens
: LESS { std::printf("Parsed binary-tokens -> LESS\n"); $$ = DragonLisp::Token::LESS; } : LESS { std::printf("Parsed binary-tokens -> LESS\n"); }
| LESS_EQUAL { std::printf("Parsed binary-tokens -> LESS_EQUAL\n"); $$ = DragonLisp::Token::LESS_EQUAL; } | LESS_EQUAL { std::printf("Parsed binary-tokens -> LESS_EQUAL\n"); }
| GREATER { std::printf("Parsed binary-tokens -> GREATER\n"); $$ = DragonLisp::Token::GREATER; } | GREATER { std::printf("Parsed binary-tokens -> GREATER\n"); }
| GREATER_EQUAL { std::printf("Parsed binary-tokens -> GREATER_EQUAL\n"); $$ = DragonLisp::Token::GREATER_EQUAL; } | GREATER_EQUAL { std::printf("Parsed binary-tokens -> GREATER_EQUAL\n"); }
| LOGNOR { std::printf("Parsed binary-tokens -> LOGNOR\n"); $$ = DragonLisp::Token::LOGNOR; } | LOGNOR { std::printf("Parsed binary-tokens -> LOGNOR\n"); }
| MOD { std::printf("Parsed binary-tokens -> MOD\n"); $$ = DragonLisp::Token::MOD; } | MOD { std::printf("Parsed binary-tokens -> MOD\n"); }
| REM { std::printf("Parsed binary-tokens -> REM\n"); $$ = DragonLisp::Token::MOD; /* This is the same as MOD. */ } | REM { std::printf("Parsed binary-tokens -> REM\n"); }
; ;
S-Expr-list S-Expr-list
@ -222,20 +212,20 @@ S-Expr-list
; ;
list-tokens list-tokens
: EQUAL { std::printf("Parsed list-tokens -> EQUAL\n"); $$ = DragonLisp::Token::EQUAL; } : EQUAL { std::printf("Parsed list-tokens -> EQUAL\n"); }
| NOT_EQUAL { std::printf("Parsed list-tokens -> NOT_EQUAL\n"); $$ = DragonLisp::Token::NOT_EQUAL; } | NOT_EQUAL { std::printf("Parsed list-tokens -> NOT_EQUAL\n"); }
| AND { std::printf("Parsed list-tokens -> AND\n"); $$ = DragonLisp::Token::AND; } | AND { std::printf("Parsed list-tokens -> AND\n"); }
| OR { std::printf("Parsed list-tokens -> OR\n"); $$ = DragonLisp::Token::OR; } | OR { std::printf("Parsed list-tokens -> OR\n"); }
| MAX { std::printf("Parsed list-tokens -> MAX\n"); $$ = DragonLisp::Token::MAX; } | MAX { std::printf("Parsed list-tokens -> MAX\n"); }
| MIN { std::printf("Parsed list-tokens -> MIN\n"); $$ = DragonLisp::Token::MIN; } | MIN { std::printf("Parsed list-tokens -> MIN\n"); }
| LOGAND { std::printf("Parsed list-tokens -> LOGAND\n"); $$ = DragonLisp::Token::LOGAND; } | LOGAND { std::printf("Parsed list-tokens -> LOGAND\n"); }
| LOGIOR { std::printf("Parsed list-tokens -> LOGIOR\n"); $$ = DragonLisp::Token::LOGIOR; } | LOGIOR { std::printf("Parsed list-tokens -> LOGIOR\n"); }
| LOGXOR { std::printf("Parsed list-tokens -> LOGXOR\n"); $$ = DragonLisp::Token::LOGXOR; } | LOGXOR { std::printf("Parsed list-tokens -> LOGXOR\n"); }
| LOGEQV { std::printf("Parsed list-tokens -> LOGEQV\n"); $$ = DragonLisp::Token::LOGEQV; } | LOGEQV { std::printf("Parsed list-tokens -> LOGEQV\n"); }
| PLUS { std::printf("Parsed list-tokens -> PLUS\n"); $$ = DragonLisp::Token::PLUS; } | PLUS { std::printf("Parsed list-tokens -> PLUS\n"); }
| MINUS { std::printf("Parsed list-tokens -> MINUS\n"); $$ = DragonLisp::Token::MINUS; } | MINUS { std::printf("Parsed list-tokens -> MINUS\n"); }
| MULTIPLY { std::printf("Parsed list-tokens -> MULTIPLY\n"); $$ = DragonLisp::Token::MULTIPLY; } | MULTIPLY { std::printf("Parsed list-tokens -> MULTIPLY\n"); }
| DIVIDE { std::printf("Parsed list-tokens -> DIVIDE\n"); $$ = DragonLisp::Token::DIVIDE; } | DIVIDE { std::printf("Parsed list-tokens -> DIVIDE\n"); }
; ;
S-Expr-if S-Expr-if