summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@hornquist.se>2020-02-07 11:17:51 +0100
committerHugo Hörnquist <hugo@hornquist.se>2020-02-07 14:16:29 +0100
commit6bb5d609a1f66bd3f06f04bba7216c648938b0bf (patch)
treee5d207d21b715e102a56e5e09f81e724231dabeb
parentparse and eval now connected to gui (diff)
downloadmath-parse-6bb5d609a1f66bd3f06f04bba7216c648938b0bf.tar.gz
math-parse-6bb5d609a1f66bd3f06f04bba7216c648938b0bf.tar.xz
Cleanup.
-rw-r--r--full-eval.rkt8
-rw-r--r--gui.rkt9
-rwxr-xr-xmain5
-rw-r--r--simple-eval.rkt7
-rw-r--r--simple-parse.rkt6
5 files changed, 9 insertions, 26 deletions
diff --git a/full-eval.rkt b/full-eval.rkt
deleted file mode 100644
index c125146..0000000
--- a/full-eval.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket
-
-(provide full-eval)
-
-(define (full-eval expr)
- (define ^ expt)
- (eval expr))
-
diff --git a/gui.rkt b/gui.rkt
index 0c465f2..d379082 100644
--- a/gui.rkt
+++ b/gui.rkt
@@ -7,12 +7,11 @@
(require (planet williams/table-panel:1:2/table-panel))
;(require table-panel)
-(require "../useful/enumerate-interval.rkt")
-(require "simple-eval.rkt")
-(require "simple-parse.rkt")
-(require "full-eval.rkt")
(require "full-parse.rkt")
+(define ns (current-namespace))
+(namespace-set-variable-value! '^ expt #t ns)
+
(define (show-window)
(define frame (new frame% [label "Calculator"]))
@@ -63,7 +62,7 @@
(map
(lambda (x) (setup-num-btn x number-panel))
- (enumerate-interval 1 9))
+ (range 1 10))
(map
(lambda (x) (setup-num-btn x left-op-panel))
'(* - +))
diff --git a/main b/main
new file mode 100755
index 0000000..28d7b0a
--- /dev/null
+++ b/main
@@ -0,0 +1,5 @@
+#!/bin/bash
+racket <<- EOF
+(require "gui.rkt")
+(show-window)
+EOF
diff --git a/simple-eval.rkt b/simple-eval.rkt
deleted file mode 100644
index 4cf6d4a..0000000
--- a/simple-eval.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket
-
-(provide simple-eval)
-
-(define (simple-eval expr)
- 5)
-
diff --git a/simple-parse.rkt b/simple-parse.rkt
deleted file mode 100644
index b60f5ec..0000000
--- a/simple-parse.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket
-
-(provide simple-parse)
-
-(define (simple-parse str)
- '(5))