summaryrefslogtreecommitdiff
path: root/starling
diff options
context:
space:
mode:
Diffstat (limited to 'starling')
-rw-r--r--starling/kernel.scm13
-rw-r--r--starling/repl-server.scm (renamed from starling/repl.scm)16
2 files changed, 15 insertions, 14 deletions
diff --git a/starling/kernel.scm b/starling/kernel.scm
index 15e05e3..0608241 100644
--- a/starling/kernel.scm
+++ b/starling/kernel.scm
@@ -46,7 +46,8 @@
#:use-module (starling config)
#:use-module (starling node)
#:use-module (starling node-2d)
- #:use-module (starling repl)
+ ;;#:use-module (starling repl)
+ #:use-module (starling repl-server)
#:use-module (starling minibuffer)
#:use-module (starling scene)
#:use-module (starling system)
@@ -166,7 +167,7 @@
;; FPS counter
(make <fps-display> #:name 'fps)
;; REPL server
- (make <repl> #:name 'repl))
+ (make <repl-server> #:name 'repl-server))
(run-script kernel
(forever
(sleep 60)
@@ -303,7 +304,7 @@
(if developer-mode?
(let ((title (sdl2:window-title (window kernel))))
(sdl2:set-window-title! (window kernel) (string-append "[ERROR] " title))
- (on-error (& kernel repl) stack key args)
+ (on-error (& kernel repl-server) stack key args)
(sdl2:set-window-title! (window kernel) title))
(apply throw key args)))
@@ -384,17 +385,17 @@ kernel. A convenient procedure for developers."
(add-minibuffer-command "show-fps" show-fps)
(add-minibuffer-command "hide-fps" hide-fps)
-(define-meta-command ((debug-game lisparuga) repl)
+(define-meta-command ((debug-game starling) repl)
"debug-game
Enter a debugger for the current game loop error."
(debugger (& (current-kernel) repl)))
-(define-meta-command ((resume-game lisparuga) repl)
+(define-meta-command ((resume-game starling) repl)
"resume-game
Resume the game loop without entering a debugger."
(set! (repl-debugging? (& (current-kernel) repl)) #f))
-(define-meta-command ((reboot lisparuga) repl)
+(define-meta-command ((reboot starling) repl)
"reboot
Reboot the current scene."
(reboot-current-scene))
diff --git a/starling/repl.scm b/starling/repl-server.scm
index cfaf5b0..b546a0f 100644
--- a/starling/repl.scm
+++ b/starling/repl-server.scm
@@ -16,33 +16,33 @@
;;; Commentary:
;;
-;; REPL for live hacking and debugging.
+;; REPL server for live hacking and debugging from Emacs or whatever.
;;
;;; Code:
-(define-module (starling repl)
+(define-module (starling repl-server)
#:use-module (oop goops)
#:use-module (ice-9 match)
#:use-module (starling node)
#:use-module (system repl coop-server)
#:use-module (system repl debug)
#:use-module (system repl repl)
- #:export (<repl>
+ #:export (<repl-server>
repl-server
repl-debug
repl-debugging?
on-error
debugger))
-(define-class <repl> (<node>)
+(define-class <repl-server> (<node>)
(repl-server #:accessor repl-server)
(repl-debug #:accessor repl-debug #:init-form #f)
(repl-debugging? #:accessor repl-debugging? #:init-form #f))
-(define-method (on-boot (repl <repl>))
+(define-method (on-boot (repl <repl-server>))
(set! (repl-server repl) (spawn-coop-repl-server)))
-(define-method (on-error (repl <repl>) stack key args)
+(define-method (on-error (repl <repl-server>) stack key args)
;; Display backtrace.
(let ((port (current-error-port)))
(display "an error has occurred!\n\n" port)
@@ -85,10 +85,10 @@
(set! (repl-debug repl) #f)
(display " done!\n")))
-(define-method (update (repl <repl>) dt)
+(define-method (update (repl <repl-server>) dt)
(poll-coop-repl-server (repl-server repl)))
-(define-method (debugger (repl <repl>))
+(define-method (debugger (repl <repl-server>))
(if (repl-debug repl)
(begin
(format #t "~a~%" (debug-error-message (repl-debug repl)))