Skip to content

Commit cfa1f87

Browse files
author
rvjansen
committed
regina 3.90
git-svn-id: https://svn.code.sf.net/p/regina-rexx/code/interpreter/trunk@96 528c8479-552a-0410-8426-e933f26d916d
1 parent 92f3263 commit cfa1f87

28 files changed

+389
-102
lines changed

Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MYDISTRO=@MYDISTRO@
2424
MACH_ARCH=@MACH_ARCH@
2525

2626
ABI_MAJOR=3
27-
ABI_MINOR=8
27+
ABI_MINOR=9
2828
#ABI=$(ABI_MAJOR).$(ABI_MINOR)$(VERSUPP)
2929
ABI=$(ABI_MAJOR).$(ABI_MINOR)
3030

@@ -56,7 +56,7 @@ CFLAGS = @CFLAGS@
5656
LDFLAGS = @LDFLAGS@
5757

5858
RANLIB_DYNAMIC = @RANLIB_DYNAMIC@
59-
CEXTRA = @CEXTRA@ @DLFCNINCDIR@ -DREGINA_SHARE_DIRECTORY=\"$(sharedir)\" @MH_UNSIGNED_CHAR_SWITCH@ -DREGINA_VERSION_DATE=\"@VER_DATE@\" -DREGINA_VERSION_MAJOR=\"@VER_MAJOR@\" -DREGINA_VERSION_MINOR=\"@VER_MINOR@\" -DREGINA_VERSION_RELEASE=\"@VER_RELEASE@\" -DREGINA_VERSION_SUPP=\"@VER_SUPP@\" -DREGINA_BITS=@bitflag@
59+
CEXTRA = @CEXTRA@ @SCREEN_FUNCS@ @DLFCNINCDIR@ -DREGINA_SHARE_DIRECTORY=\"$(sharedir)\" @MH_UNSIGNED_CHAR_SWITCH@ -DREGINA_VERSION_DATE=\"@VER_DATE@\" -DREGINA_VERSION_MAJOR=\"@VER_MAJOR@\" -DREGINA_VERSION_MINOR=\"@VER_MINOR@\" -DREGINA_VERSION_RELEASE=\"@VER_RELEASE@\" -DREGINA_VERSION_SUPP=\"@VER_SUPP@\" -DREGINA_BITS=@bitflag@
6060
DEBUG = @DEBUG@
6161
DEBUGGING = @DEBUGGING@
6262
TRACEMEM = @TRACEMEM@
@@ -213,7 +213,7 @@ SHOFILES = funcs.so.$(OBJ) builtin.so.$(OBJ) error.so.$(OBJ) variable.so.$(OBJ)
213213
drexx.so.$(OBJ) client.so.$(OBJ) rexxsaa.so.$(OBJ) $(ALLOCA_SHO) $(STATICLD_SHO) $(MT_FILE).so.$(OBJ) instore.so.$(OBJ) arxfuncs.so.$(OBJ) \
214214
$(GCI_SHO) mygetopt.so.$(OBJ)
215215

216-
REGUTILOBJ = inifile.$(OBJ) regcrypt.$(OBJ) regfilesys.$(OBJ) regini.$(OBJ) regmacrospace.$(OBJ) regscreenux.$(OBJ) regsemux.$(OBJ) regstem.$(OBJ) regunicode.$(OBJ) regutil.$(OBJ) rxsupport.$(OBJ) regtrig.$(OBJ) $(FNMATCH_SHO)
216+
REGUTILOBJ = inifile.$(OBJ) regcrypt.$(OBJ) regfilesys.$(OBJ) regini.$(OBJ) regmacrospace.$(OBJ) @REGSCREENUX@ regsemux.$(OBJ) regstem.$(OBJ) regunicode.$(OBJ) regutil.$(OBJ) rxsupport.$(OBJ) regtrig.$(OBJ) $(FNMATCH_SHO)
217217

218218
DEMODIR = $(REG_DIR)/demo
219219
ZIP_DEMODIR = demo
@@ -944,7 +944,7 @@ regtrig.$(OBJ): $(regutildir)/regtrig.c
944944
$(CC) -c $(COPT) $(CC2O) $(DYN_COMP) $(regutildir)/regtrig.c
945945

946946
$(SHLPRE)regutil$(MODPST): $(REGUTILOBJ) $(SHLPRE)$(SHLFILE)$(SHLPST) $(REGUTILEXP)
947-
$(LD_RXLIB_UTILA) $(REGUTILEXPORTS) $(REGUTILOBJ) $(LD_RXLIB_UTILB) $(BOTHLIBS) $(REGUTIL_TERM_LIB) $(REGUTIL_MATH_LIB)
947+
$(LD_RXLIB_UTILA) $(REGUTILEXPORTS) $(REGUTILOBJ) $(LD_RXLIB_UTILB) $(BOTHLIBS) #$(REGUTIL_TERM_LIB) $(REGUTIL_MATH_LIB)
948948
$(RANLIB_DYNAMIC)
949949

950950

README.383

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Regina 3.8.3
2+
22 September 2014
3+
4+
Changes in this release (from 3.8.2)
5+
----------------------------------
6+
* Finally a fix for Bug #429
7+
* Fix for Bug #433, #434
8+
* Added extra QUERY options; CREATETIME, MODIFYTIME and ACCESSTIME to STREAM BIF
9+
Returns a time_t value for create, modify and access time of the persistent stream
10+
* Feature Request #35 - GETCALLER BIF to determine who called the program
11+
* Feature Request #36 - .FILE reserved variable

README.390

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Regina 3.9.0
2+
17 October 2014
3+
4+
Changes in this release (from 3.8.3)
5+
----------------------------------
6+
* Fix for Bug #436. This allows for errors generated in the parsing stage to be trapped by
7+
a system exit.

Regina.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
%define debug_package %{nil}
22
%define vermajor 3
3-
%define verminor 8
3+
%define verminor 9
44
Name: Regina-REXX
5-
Version: 3.8.2
5+
Version: 3.9.0
66
Release: 1
77
Group: Development/Languages/Other
88
Source: %{name}-%{version}.tar.bz2

client.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,10 @@ int IfcExecScript( tsd_t * volatile TSD, int NameLen, const char *Name,
439439
{
440440
streng *SrcStr = wrapstring( TSD, SourceString, SourceStringLen );
441441
internal_parser_type ipt;
442+
/*
443+
* Fix for Bug #436. Enable system exit to trap parsing errors
444+
*/
445+
TSD->systeminfo->hooks = hooks;
442446

443447
ipt = enter_macro( TSD, SrcStr, instore_buf, instore_length ) ;
444448
if ( ( CallType == RX_TYPE_COMMAND )

configure

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.68 for Regina Rexx Interpreter 3.8.2.
3+
# Generated by GNU Autoconf 2.68 for Regina Rexx Interpreter 3.9.0.
44
#
55
# Report bugs to <mark@rexx.org>.
66
#
@@ -560,8 +560,8 @@ MAKEFLAGS=
560560
# Identity of this package.
561561
PACKAGE_NAME='Regina Rexx Interpreter'
562562
PACKAGE_TARNAME='Regina-REXX'
563-
PACKAGE_VERSION='3.8.2'
564-
PACKAGE_STRING='Regina Rexx Interpreter 3.8.2'
563+
PACKAGE_VERSION='3.9.0'
564+
PACKAGE_STRING='Regina Rexx Interpreter 3.9.0'
565565
PACKAGE_BUGREPORT='mark@rexx.org'
566566
PACKAGE_URL=''
567567

@@ -705,6 +705,8 @@ DEBUGGING
705705
DEBUG
706706
REGUTIL_MATH_LIB
707707
REGUTIL_TERM_LIB
708+
REGSCREENUX
709+
SCREEN_FUNCS
708710
FNMATCH_TSO
709711
FNMATCH_SHO
710712
FNMATCH
@@ -803,6 +805,7 @@ enable_32bit
803805
enable_64bit
804806
with_arch
805807
enable_libdir_change
808+
enable_screen
806809
enable_debug
807810
enable_purify
808811
enable_efence
@@ -1382,7 +1385,7 @@ if test "$ac_init_help" = "long"; then
13821385
# Omit some internal or obsolete options to make the list less imposing.
13831386
# This message is too long to be a string in the A/UX 3.1 sh.
13841387
cat <<_ACEOF
1385-
\`configure' configures Regina Rexx Interpreter 3.8.2 to adapt to many kinds of systems.
1388+
\`configure' configures Regina Rexx Interpreter 3.9.0 to adapt to many kinds of systems.
13861389
13871390
Usage: $0 [OPTION]... [VAR=VALUE]...
13881391
@@ -1448,7 +1451,7 @@ fi
14481451

14491452
if test -n "$ac_init_help"; then
14501453
case $ac_init_help in
1451-
short | recursive ) echo "Configuration of Regina Rexx Interpreter 3.8.2:";;
1454+
short | recursive ) echo "Configuration of Regina Rexx Interpreter 3.9.0:";;
14521455
esac
14531456
cat <<\_ACEOF
14541457
@@ -1459,6 +1462,7 @@ Optional Features:
14591462
--enable-32bit specify if 32bit libraries are to be used
14601463
--enable-64bit specify if 64bit libraries are to be used
14611464
--enable-libdir-change specify --disable-libdir-change if building a .deb
1465+
--disable-screen disable terminal functions
14621466
--enable-debug turn on debugging
14631467
--enable-purify link with Purify (TM)
14641468
--enable-efence link with Electric Fence
@@ -1568,7 +1572,7 @@ fi
15681572
test -n "$ac_init_help" && exit $ac_status
15691573
if $ac_init_version; then
15701574
cat <<\_ACEOF
1571-
Regina Rexx Interpreter configure 3.8.2
1575+
Regina Rexx Interpreter configure 3.9.0
15721576
generated by GNU Autoconf 2.68
15731577
15741578
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1991,7 +1995,7 @@ cat >config.log <<_ACEOF
19911995
This file contains any messages produced by compilers while
19921996
running configure, to aid debugging if configure makes a mistake.
19931997
1994-
It was created by Regina Rexx Interpreter $as_me 3.8.2, which was
1998+
It was created by Regina Rexx Interpreter $as_me 3.9.0, which was
19951999
generated by GNU Autoconf 2.68. Invocation command line was
19962000
19972001
$ $0 $@
@@ -5359,6 +5363,23 @@ fi
53595363

53605364

53615365

5366+
# Check whether --enable-screen was given.
5367+
if test "${enable_screen+set}" = set; then :
5368+
enableval=$enable_screen; with_screen=$enableval
5369+
else
5370+
with_screen=yes
5371+
fi
5372+
5373+
if test "$with_screen" = no; then
5374+
SCREEN_FUNCS="-DNOSCREEN_FUNCS"
5375+
REGSCREENUX=""
5376+
else
5377+
SCREEN_FUNCS=""
5378+
REGSCREENUX="regscreenux.\$(OBJ)"
5379+
fi
5380+
5381+
5382+
53625383
save_LIBS="$LIBS"
53635384
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
53645385
$as_echo_n "checking for library containing tgetent... " >&6; }
@@ -5418,7 +5439,7 @@ else
54185439
REGUTIL_TERM_LIB=""
54195440
fi
54205441

5421-
if test "$REGUTIL_TERM_LIB" = "none required" -o "$REGUTIL_TERM_LIB" = "no"; then
5442+
if test "$REGUTIL_TERM_LIB" = "none required" -o "$REGUTIL_TERM_LIB" = "no" -o "$with_screen" = "no"; then
54225443
REGUTIL_TERM_LIB=""
54235444
fi
54245445
LIBS="$save_LIBS"
@@ -8439,7 +8460,7 @@ if test "$DYN_COMP" = ""; then
84398460
$as_echo_n "checking compiler flags for a dynamic object... " >&6; }
84408461

84418462
cat > conftest.$ac_ext <<EOF
8442-
#line 8442 "configure"
8463+
#line 8463 "configure"
84438464
int a=0
84448465
EOF
84458466

@@ -8822,7 +8843,7 @@ case "$target" in
88228843
$as_echo_n "checking how to create a shared library... " >&6; }
88238844
mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5'
88248845
cat > conftest.$ac_ext <<EOF
8825-
#line 8825 "configure"
8846+
#line 8846 "configure"
88268847
int foo()
88278848
{
88288849
return(0);
@@ -8913,7 +8934,7 @@ rm -f conftest*
89138934

89148935
mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5'
89158936
cat > conftest.$ac_ext <<EOF
8916-
#line 8916 "configure"
8937+
#line 8937 "configure"
89178938
int foo()
89188939
{
89198940
return(0);
@@ -10043,7 +10064,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1004310064
# report actual input values of CONFIG_FILES etc. instead of their
1004410065
# values after options handling.
1004510066
ac_log="
10046-
This file was extended by Regina Rexx Interpreter $as_me 3.8.2, which was
10067+
This file was extended by Regina Rexx Interpreter $as_me 3.9.0, which was
1004710068
generated by GNU Autoconf 2.68. Invocation command line was
1004810069
1004910070
CONFIG_FILES = $CONFIG_FILES
@@ -10105,7 +10126,7 @@ _ACEOF
1010510126
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1010610127
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1010710128
ac_cs_version="\\
10108-
Regina Rexx Interpreter config.status 3.8.2
10129+
Regina Rexx Interpreter config.status 3.9.0
1010910130
configured by $0, generated by GNU Autoconf 2.68,
1011010131
with options \\"\$ac_cs_config\\"
1011110132

configure.in

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,27 @@ AC_SUBST(FNMATCH)
249249
AC_SUBST(FNMATCH_SHO)
250250
AC_SUBST(FNMATCH_TSO)
251251

252+
dnl --------------- allow --disable-screen to disable terminal functions
253+
AC_ARG_ENABLE(screen,
254+
[ --disable-screen disable terminal functions],
255+
[with_screen=$enableval],
256+
[with_screen=yes],
257+
)
258+
if test "$with_screen" = no; then
259+
SCREEN_FUNCS="-DNOSCREEN_FUNCS"
260+
REGSCREENUX=""
261+
else
262+
SCREEN_FUNCS=""
263+
REGSCREENUX="regscreenux.\$(OBJ)"
264+
fi
265+
AC_SUBST(SCREEN_FUNCS)
266+
AC_SUBST(REGSCREENUX)
267+
252268
dnl
253269
dnl where are termcap functions
254270
save_LIBS="$LIBS"
255271
AC_SEARCH_LIBS(tgetent,[ncurses termcap curses termlib],REGUTIL_TERM_LIB="$ac_cv_search_tgetent",REGUTIL_TERM_LIB="")
256-
if test "$REGUTIL_TERM_LIB" = "none required" -o "$REGUTIL_TERM_LIB" = "no"; then
272+
if test "$REGUTIL_TERM_LIB" = "none required" -o "$REGUTIL_TERM_LIB" = "no" -o "$with_screen" = "no"; then
257273
REGUTIL_TERM_LIB=""
258274
fi
259275
LIBS="$save_LIBS"

debian/changelog

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
regina (3.9.0-1) unstable; urgency=low
2+
3+
* Fix for Bug #436
4+
5+
-- Mark Hessling <mark@rexx.org> Thu, 16 Oct 2014 01:50:00 +1000
6+
7+
regina (3.8.3-1) unstable; urgency=low
8+
9+
* Finally a fix for Bug #429
10+
* Fix for Bug #433
11+
* Added extra QUERY options; CREATETIME, MODIFYTIME and ACCESSTIME to STREAM BIF
12+
Returns a time_t value for create, modify and access time of the persistent stream
13+
14+
-- Mark Hessling <mark@rexx.org> Thu, 28 Jul 2014 01:50:00 +1000
15+
116
regina (3.8.2-1) unstable; urgency=low
217

318
* Fix for Bugs #429, #430, #387

debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ soname=3
1515
#
1616
# If the version of Regina being built includes a value for VER_SUPP in the regina.ver file,
1717
# ensure that soversion includes the full dotted version followed by VER_SUPP. eg 3.7RC1
18-
soversion=3.8
19-
changelog=README.382
18+
soversion=3.9
19+
changelog=README.390
2020

2121
package=libregina$(soname)
2222
rexxpackage=regina-rexx

defs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,8 @@
392392
#define POOL0_RS 4
393393
#define POOL0_MN 5
394394
#define POOL0_LINE 6
395-
#define POOL0_ENDOFLINE 7
395+
#define POOL0_FILE 7
396+
#define POOL0_ENDOFLINE 8
396397
#define POOL0_CNT ( POOL0_ENDOFLINE + 1 )
397398

398399
/*

0 commit comments

Comments
 (0)