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