Skip to content

Commit d61db91

Browse files
authored
Merge branch 'master' into master
2 parents 8eca612 + 10158f9 commit d61db91

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
## [EusLisp](http://euslisp.sourceforge.net) [![Build Status](https://travis-ci.org/euslisp/EusLisp.png?branch=master)](https://travis-ci.org/euslisp/EusLisp)
1+
## [EusLisp] [![Build Status](https://travis-ci.org/euslisp/EusLisp.png?branch=master)](https://travis-ci.org/euslisp/EusLisp)
22

3-
EusLisp was originally developed by [Dr. Toshihiro Matusi at AIST](http://staff.aist.go.jp/t.matsui/ )
3+
EusLisp was originally developed by [Dr. Toshihiro Matsui at AIST](http://staff.aist.go.jp/t.matsui/ )
44

55
This page and repository are maintained by [JSK](http://www.jsk.t.u-tokyo.ac.jp ) at The University of Tokyo.
66

77
### Introduction
88

99
EusLisp is an integrated programming system for the research on intelligent robots based on Common Lisp and Object-Oriented programming. The principal subjects in the field of robotics research are sensory data processing, visual environment recognition, collision avoiding motion planning, and task planning. In either problem, three dimensional shape models of robots and environment play crucial roles. A motivation to the development of EusLisp was a demand for an extensible solid modeler that can easily be made use of from higher level symbolic processing system. Investigations into traditional solid modelers proved that the vital requirement for their implementation language was the list processing capability to represent and manage topology among model components. Numerical computation power was also important, but locality of geometric computation suggested the provision of vector/matrix functions as built-ins would greatly ease programming. (From [EusLisp Manual, Part I, EusLisp Basics, 1. Introduction](http://staff.aist.go.jp/t.matsui/eus/intro/eusintro.html ))
1010

11-
### Easy Installation and Demo Program
11+
### How To Download and Compile
1212

13-
Please check http://jskeus.sourceforge.net for easy installation and current demo programs. Most of programs in euslisp/eus/lib/ euslisp/eus/contrib/ directories are out-dated.
13+
### Installation
1414

15-
### How To Download and Compile
15+
#### Binary Installation (Recommended)
16+
17+
Please check http://github.com/euslisp/jskeus for easy binary installation and how to run current
18+
demo programs. Most of programs in EusLisp/lib/ EusLisp/contrib/ directories are outdated.
19+
20+
#### Source Installation (Experts Only)
1621

17-
Note: we strongly recommend you to check http://github.com/euslisp/jskeus for download and compile euslisp and irteus; humanoid model description and other useful function layer on euslisp . Following description is only for euslisp hard-core developers.
22+
Note: we strongly recommend you to check http://github.com/euslisp/jskeus for download and compile euslisp and irteus; humanoid model description and other useful function layer on euslisp. Following description is only for euslisp hard-core developers.
1823

1924

2025
```

lisp/c/arith.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ register pointer argv[];
989989
ckarg(1);
990990
a=argv[0];
991991
if (a==makeint(MINNEGFIXNUM)) return(makebig1(-MINNEGFIXNUM));
992-
if (isint(a)) return(makeint(abs(intval(a))));
992+
if (isint(a)) return(makeint(labs(intval(a))));
993993
else if (isflt(a)) return(makeflt(fabs(fltval(a))));
994994
else if (pisbignum(a)) {
995995
if (big_sign(a)<0) {

lisp/comp/comp.l

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@
407407
(send trans :nullx) 'symbol)
408408
((eq) (check-arg 2 argcount 'eq) (send trans :eqx) 'symbol)
409409
((memq) (check-arg 2 argcount 'memq) (send trans :memqx) t)
410-
((1+) (check-arg 1 argcount '1+) (send trans :1+) 'integer)
411-
((1-) (check-arg 1 argcount '1-) (send trans :1-) 'integer)
410+
((1+) (check-arg 1 argcount '1+) (if (integerp (car args)) (progn (send trans :1+) 'integer) (progn (send trans :call sym argcount) 'float)))
411+
((1-) (check-arg 1 argcount '1-) (if (integerp (car args)) (progn (send trans :1-) 'integer) (progn (send trans :call sym argcount) 'float)))
412412
((car first) (check-arg 1 argcount sym) (send trans :car) t)
413413
((cdr rest) (check-arg 1 argcount sym) (send trans :cdr) t)
414414
((cadr second) (check-arg 1 argcount sym) (send trans :cadr) t)
@@ -1223,6 +1223,8 @@
12231223
(setq *optimize* optimize
12241224
*safety* safety
12251225
*verbose* verbose)
1226+
(unless (send (pathname file) :directory)
1227+
(setq file (namestring (merge-pathnames "./" file))))
12261228
(when o
12271229
(setq o (pathname o))
12281230
(setq o (merge-pathnames o file))

0 commit comments

Comments
 (0)