From 4c4a75a77bf91c6840cfa9101f3eaabd8fee7dbd Mon Sep 17 00:00:00 2001 From: bhattigurjot Date: Fri, 23 May 2014 14:30:08 +0000 Subject: remove runtime errors for guile --- diff --git a/scm/drgeo_scm_interface.scm b/scm/drgeo_scm_interface.scm index 4112602..d99c9fa 100644 --- a/scm/drgeo_scm_interface.scm +++ b/scm/drgeo_scm_interface.scm @@ -140,7 +140,7 @@ ((middle-segment) (send parent 'init (drgeoMake-middleSegment currentFigure myName (send (car Lopt) 'id)))) - ((coordinate) ()) + ((coordinate) '()) ;; line, line (no circle and arc) ((intersection) (send parent 'init (drgeoMake-intersection currentFigure myName @@ -443,4 +443,4 @@ ;(new-figure "Ma figure") ;(define a (Numeric "a" 'free 0 0 1)) -;(define p (Point "o" 'intersection a a)) \ No newline at end of file +;(define p (Point "o" 'intersection a a)) diff --git a/scm/drgeo_scm_interface_constant_sr.scm b/scm/drgeo_scm_interface_constant_sr.scm index c715d54..78785c5 100644 --- a/scm/drgeo_scm_interface_constant_sr.scm +++ b/scm/drgeo_scm_interface_constant_sr.scm @@ -27,21 +27,21 @@ ;; ;; Basic definitions -(define дефиниши define) -(define некасу lets) -(define нека let) -(define постави! set!) -(define ако if) -(define почни begin) - -(define definiši define) -(define definisi define) -(define nekasu lets) -(define neka let) -(define postavi! set!) -(define ako if) -(define pocni begin) -(define počni begin) +(define-syntax дефиниши (syntax-rules () ((_ args ...) (define args ...)))) +(define-syntax некасу (syntax-rules () ((_ args ...) (lets args ...)))) +(define-syntax нека (syntax-rules () ((_ args ...) (let args ...)))) +(define-syntax постави! (syntax-rules () ((_ args ...) (set! args ...)))) +(define-syntax ако (syntax-rules () ((_ args ...) (if args ...)))) +(define-syntax почни (syntax-rules () ((_ args ...) (begin args ...)))) + +(define-syntax definiši (syntax-rules () ((_ args ...) (define args ...)))) +(define-syntax definisi (syntax-rules () ((_ args ...) (define args ...)))) +(define-syntax nekasu (syntax-rules () ((_ args ...) (lets args ...)))) +(define-syntax neka (syntax-rules () ((_ args ...) (let args ...)))) +(define-syntax postavi! (syntax-rules () ((_ args ...) (set! args ...)))) +(define-syntax ako (syntax-rules () ((_ args ...) (if args ...)))) +(define-syntax pocni (syntax-rules () ((_ args ...) (begin args ...)))) +(define-syntax počni (syntax-rules () ((_ args ...) (begin args ...)))) ;; Color taken from geo/couleur.h -- cgit v0.9.0.2