hare

commit 15519977a33926e84d09e556b4348d6f80d1c4d6
parent 8b86a7f31bb87c25db30264cd2701f67176a2ce5
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri, 16 Apr 2021 07:43:25 -0400

hare::parse: remove exprclass.ha

Diffstat:
M
hare/parse/expr.ha
 | 
6
++++++
D
hare/parse/exprclass.ha
 | 
10
----------
M
scripts/gen-stdlib
 | 
1
-
M
stdlib.mk
 | 
2
--

4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/hare/parse/expr.ha b/hare/parse/expr.ha
@@ -2,6 +2,12 @@ use hare::ast;
 use hare::lex::{ltok};
 use hare::lex;
 
+// Parses an expression.
+export fn expression(lexer: *lex::lexer) (ast::expr | error) = {
+	// TODO: if, for, switch, match, etc
+	return binarithm(lexer, void, 0);
+};
+
 fn binarithm(
 	lexer: *lex::lexer,
 	lvalue: (ast::expr | void),
diff --git a/hare/parse/exprclass.ha b/hare/parse/exprclass.ha
@@ -1,10 +0,0 @@
-use hare::ast;
-use hare::lex::{ltok};
-use hare::lex;
-use io;
-
-// Parses an expression.
-export fn expression(lexer: *lex::lexer) (ast::expr | error) = {
-	// TODO: if, for, switch, match, etc
-	return binarithm(lexer, void, 0);
-};
diff --git a/scripts/gen-stdlib b/scripts/gen-stdlib
@@ -373,7 +373,6 @@ gensrcs_hare_parse() {
 	gen_srcs hare::parse \
 		decl.ha \
 		expr.ha \
-		exprclass.ha \
 		ident.ha \
 		import.ha \
 		parse.ha \
diff --git a/stdlib.mk b/stdlib.mk
@@ -515,7 +515,6 @@ $(HARECACHE)/hare/module/hare_module.ssa: $(stdlib_hare_module_srcs) $(stdlib_rt
 stdlib_hare_parse_srcs= \
 	$(STDLIB)/hare/parse/decl.ha \
 	$(STDLIB)/hare/parse/expr.ha \
-	$(STDLIB)/hare/parse/exprclass.ha \
 	$(STDLIB)/hare/parse/ident.ha \
 	$(STDLIB)/hare/parse/import.ha \
 	$(STDLIB)/hare/parse/parse.ha \
@@ -1377,7 +1376,6 @@ $(TESTCACHE)/hare/module/hare_module.ssa: $(testlib_hare_module_srcs) $(testlib_
 testlib_hare_parse_srcs= \
 	$(STDLIB)/hare/parse/decl.ha \
 	$(STDLIB)/hare/parse/expr.ha \
-	$(STDLIB)/hare/parse/exprclass.ha \
 	$(STDLIB)/hare/parse/ident.ha \
 	$(STDLIB)/hare/parse/import.ha \
 	$(STDLIB)/hare/parse/parse.ha \