version changed to 2.3

.deps/frontend.Po

@@ -30,7 +30,8 @@ frontend.o: frontend.c /usr/include/stdc-predef.h /usr/include/time.h \
  /usr/include/bits/stdio.h /usr/include/unistd.h \
  /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
  /usr/include/bits/confname.h /usr/include/bits/getopt_posix.h \
- /usr/include/bits/getopt_core.h
+ /usr/include/bits/getopt_core.h /usr/include/string.h \
+ /usr/include/strings.h
 
 /usr/include/stdc-predef.h:
 
@@ -155,3 +156,7 @@ frontend.h:
 /usr/include/bits/getopt_posix.h:
 
 /usr/include/bits/getopt_core.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:

Makefile

@@ -242,7 +242,7 @@ CFLAGS = -g -O2
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"jff-a2c\" -DVERSION=\"2.1.1\" -DSTDC_HEADERS=1
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"jff-a2c\" -DVERSION=\"2.3\" -DSTDC_HEADERS=1
 DEPDIR = .deps
 ECHO_C = 
 ECHO_N = -n
@@ -275,7 +275,7 @@ RANLIB = ranlib
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
-VERSION = 2.1.1
+VERSION = 2.3
 abs_builddir = /usr/shared/algol-60-compiler
 abs_srcdir = /usr/shared/algol-60-compiler
 abs_top_builddir = /usr/shared/algol-60-compiler

README.md

@@ -24,9 +24,9 @@ is translated into
 	return __res_val;
 	}
 
-The resulting compiler compiled Algol 60, using C as intermediate language
-and - if the mapping to C succeeded - is invoked a C compiler and
-generated an executable. 
+The resulting compiler compiled Algol 60, using C as intermediate language,
+and - if the mapping to C succeeded - invoked a C compiler and
+an executable is generated. 
 For those interested: it was certainly capable of handling things like the
 "man or boy" example (although that takes more lines in C than the fac example
 above).

config.log

@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure 
+  $ ./configure --no-create --no-recursion
 
 ## --------- ##
 ## Platform. ##
@@ -127,6 +127,8 @@ configure:3299: $? = 0
 configure:3311: result: yes
 configure:3331: checking whether make supports the include directive
 configure:3346: make -f confmf.GNU && cat confinc.out
+make[1]: Entering directory '/usr/shared/algol-60-compiler'
+make[1]: Leaving directory '/usr/shared/algol-60-compiler'
 this is the am__doit target
 configure:3349: $? = 0
 configure:3368: result: yes (GNU style)
@@ -155,7 +157,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define PACKAGE "jff-a2c"
-| #define VERSION "2.1.1"
+| #define VERSION "2.3"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:3736: result: gcc -E
@@ -176,7 +178,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define PACKAGE "jff-a2c"
-| #define VERSION "2.1.1"
+| #define VERSION "2.3"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:3799: checking for grep that handles long lines and -e
@@ -195,27 +197,6 @@ configure:4194: checking that generated files are newer than configure
 configure:4200: result: done
 configure:4223: creating ./config.status
 
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by config.status, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on lenovo
-
-config.status:777: creating Makefile
-config.status:949: executing depfiles commands
-config.status:1026: cd .       && sed -e '/# am--include-marker/d' Makefile         | make -f - am--depfiles
-make: Nothing to be done for 'am--depfiles'.
-config.status:1031: $? = 0
-
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
@@ -279,7 +260,7 @@ CFLAGS='-g -O2'
 CPP='gcc -E'
 CPPFLAGS=''
 CYGPATH_W='echo'
-DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"jff-a2c\" -DVERSION=\"2.1.1\" -DSTDC_HEADERS=1'
+DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"jff-a2c\" -DVERSION=\"2.3\" -DSTDC_HEADERS=1'
 DEPDIR='.deps'
 ECHO_C=''
 ECHO_N='-n'
@@ -311,7 +292,7 @@ RANLIB='ranlib'
 SET_MAKE=''
 SHELL='/bin/sh'
 STRIP=''
-VERSION='2.1.1'
+VERSION='2.3'
 ac_ct_CC='gcc'
 am__EXEEXT_FALSE=''
 am__EXEEXT_TRUE='#'
@@ -364,7 +345,30 @@ target_alias=''
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
 #define PACKAGE "jff-a2c"
-#define VERSION "2.1.1"
+#define VERSION "2.3"
 #define STDC_HEADERS 1
 
 configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by config.status, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on lenovo
+
+config.status:777: creating Makefile
+config.status:949: executing depfiles commands
+config.status:1026: cd .       && sed -e '/# am--include-marker/d' Makefile         | make -f - am--depfiles
+make[1]: Entering directory '/usr/shared/algol-60-compiler'
+make[1]: Nothing to be done for 'am--depfiles'.
+make[1]: Leaving directory '/usr/shared/algol-60-compiler'
+config.status:1031: $? = 0

config.status

@@ -640,7 +640,7 @@ S["AUTOHEADER"]="${SHELL} /usr/shared/algol-60-compiler/missing autoheader"
 S["AUTOMAKE"]="${SHELL} /usr/shared/algol-60-compiler/missing automake-1.16"
 S["AUTOCONF"]="${SHELL} /usr/shared/algol-60-compiler/missing autoconf"
 S["ACLOCAL"]="${SHELL} /usr/shared/algol-60-compiler/missing aclocal-1.16"
-S["VERSION"]="2.1.1"
+S["VERSION"]="2.3"
 S["PACKAGE"]="jff-a2c"
 S["CYGPATH_W"]="echo"
 S["am__isrc"]=""
@@ -655,7 +655,7 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DPACKAGE=\\\"jff-"\
-"a2c\\\" -DVERSION=\\\"2.1.1\\\" -DSTDC_HEADERS=1"
+"a2c\\\" -DVERSION=\\\"2.3\\\" -DSTDC_HEADERS=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
 S["libdir"]="${exec_prefix}/lib"

configure

@@ -2383,7 +2383,7 @@ fi
 # Define the identity of the package.
 
  PACKAGE=jff-a2c
- VERSION=2.1.1
+ VERSION=2.3
 
 
 cat >>confdefs.h <<_ACEOF

examples/ei.h

@@ -0,0 +1,41 @@
+#
+
+/* jff_algol (Jan van Katwijk) */
+/* Version 2.3		*/
+/* input file: ei.alg		*/
+/* Compiled at Sat Dec  8 10:06:11 2018		*/
+
+
+#include	<stdio.h>
+#include "/usr/local/include/jff_header.h"
+/* Headers		*/
+extern	double fabs (double); /* fabs declared at line 1*/
+extern	double ln (double); /* ln declared at line 9*/
+extern	double exp (double); /* exp declared at line 10*/
+extern	void outstring (int,char	*); /* outstring declared at line 26*/
+extern	void outinteger (int,int); /* outinteger declared at line 40*/
+extern	void outreal (int,double); /* outreal declared at line 43*/
+extern	double _jfrac_42 (int,int *, double	*,int *, double	*); /* jfrac declared at line 3*/
+extern	double _chepolsum_50 (int,double,int *, double	*); /* chepolsum declared at line 23*/
+extern	double _pol_54 (int,double,int *, double	*); /* pol declared at line 37*/
+extern	double _ei_58 (double); /* ei declared at line 46*/
+struct ___ei_58_rec {
+char *__l_field;
+double __res_val;
+double x;
+int __dv0 [2 * 1 + DOPE_BASE];
+double	*_p_60; /* p declared at line 48*/
+int __dv1 [2 * 1 + DOPE_BASE];
+double	*_q_60; /* q declared at line 49*/
+double _t_61; /* t declared at line 82*/
+double _r_61; /* r declared at line 82*/
+double _x0_61; /* x0 declared at line 82*/
+double _xmx0_61; /* xmx0 declared at line 82*/
+double _z_62; /* z declared at line 96*/
+double _z2_62; /* z2 declared at line 96*/
+double _y_63; /* y declared at line 106*/
+double _y_64; /* y declared at line 116*/
+double _y_65; /* y declared at line 128*/
+};
+extern int _i_41; /* i declared at line 141*/
+extern double _x_41; /* x declared at line 142*/

examples/fbench.h

@@ -0,0 +1,63 @@
+#
+
+/* jff_algol (Jan van Katwijk) */
+/* Version 2.1.1		*/
+/* input file: fbench.alg		*/
+/* Compiled at Fri Dec  7 18:39:53 2018		*/
+
+
+#include	<stdio.h>
+#include "/usr/local/include/jff_header.h"
+/* Headers		*/
+extern	double sqrt (double); /* sqrt declared at line 5*/
+extern	double sin (double); /* sin declared at line 6*/
+extern	double cos (double); /* cos declared at line 7*/
+extern	double arctan (double); /* arctan declared at line 8*/
+extern	void outstring (int,char	*); /* outstring declared at line 26*/
+extern	void outinteger (int,int); /* outinteger declared at line 40*/
+extern	void outreal_16_11 (int,double); /* outreal_16_11 declared at line 47*/
+extern int _a_line_41; /* a_line declared at line 33*/
+extern int _b_line_41; /* b_line declared at line 33*/
+extern int _c_line_41; /* c_line declared at line 33*/
+extern int _d_line_41; /* d_line declared at line 33*/
+extern int _e_line_41; /* e_line declared at line 34*/
+extern int _f_line_41; /* f_line declared at line 34*/
+extern int _g_prime_line_41; /* g_prime_line declared at line 34*/
+extern int _h_line_41; /* h_line declared at line 35*/
+extern double _spectral_line_41 []; // 
+extern int _current_surfaces_41; /* current_surfaces declared at line 38*/
+extern	int __dv0 [];
+extern double	*_test_case_41; /* test_case declared at line 39*/
+extern int _curvature_radius_41; /* curvature_radius declared at line 40*/
+extern int _index_of_refraction_41; /* index_of_refraction declared at line 40*/
+extern int _dispersion_41; /* dispersion declared at line 40*/
+extern int _edge_thickness_41; /* edge_thickness declared at line 41*/
+extern double _clear_aperture_41; /* clear_aperture declared at line 43*/
+extern double _aber_lspher_41; /* aber_lspher declared at line 43*/
+extern double _aberr_osc_41; /* aberr_osc declared at line 43*/
+extern double _aberr_lchrom_41; /* aberr_lchrom declared at line 43*/
+extern double _max_lspher_41; /* max_lspher declared at line 44*/
+extern double _mac_osc_41; /* mac_osc declared at line 44*/
+extern double _max_lchrom_41; /* max_lchrom declared at line 44*/
+extern double _radius_of_curvature_41; /* radius_of_curvature declared at line 44*/
+extern double _object_distance_41; /* object_distance declared at line 45*/
+extern double _ray_height_41; /* ray_height declared at line 45*/
+extern double _axis_slope_angle_41; /* axis_slope_angle declared at line 45*/
+extern double _from_index_41; /* from_index declared at line 46*/
+extern double _to_index_41; /* to_index declared at line 46*/
+extern int _number_of_iterations_41; /* number_of_iterations declared at line 48*/
+extern int _iteration_41; /* iteration declared at line 48*/
+extern int _paraxial_41; /* paraxial declared at line 50*/
+extern int _marginal_ray_41; /* marginal_ray declared at line 50*/
+extern int _paraxial_ray_41; /* paraxial_ray declared at line 50*/
+extern int _of_field_41; /* of_field declared at line 59*/
+extern int _sa_field_41; /* sa_field declared at line 59*/
+extern	int __dv1 [];
+extern double	*_od_sa_41; /* od_sa declared at line 60*/
+extern double _od_cline_41; /* od_cline declared at line 62*/
+extern double _od_fline_41; /* od_fline declared at line 62*/
+extern	double _cot_42 (double); /* cot declared at line 68*/
+extern	double _arc_sin_44 (double); /* arc_sin declared at line 79*/
+extern	void _outbigreal_46 (int,double); /* outbigreal declared at line 114*/
+extern	void _transit_surface_48 (); /* transit_surface declared at line 161*/
+extern	void _trace_line_51 (int,double); /* trace_line declared at line 225*/

frontend.c

@@ -43,9 +43,10 @@
 //
 #include	<time.h>
 #include	"frontend.h"
+#include	<string.h>
 
 #ifndef VERSION
-#define VERSION 2
+#define VERSION "2.3"
 #endif
 
 char	*compile_time	= "no time specified";

jff_header.h

@@ -54,6 +54,9 @@ extern	char	*__get_thunk_link (char **, int);
 extern	char	*__get_switch_address (char **, int, char);
 extern	char	*__get_switch_link (char **, int);
 extern	double	read_real (int);
+int     raw_in  (int);  
+int     raw_out (int fd, int val);
+
 #define	DOPE_BASE	2
 #define	true	1
 #define	false	0

jff_header.template

@@ -36,7 +36,7 @@
 #include <setjmp.h>
 #include <math.h>
 #include	<stdarg.h>
-extern	char	*_element_address();
+extern  void    *__jff_element_address (char *, int *, int, ...);^M
 extern	void	__dv_init();
 extern	int	*__jff_descriptor_for_value (int *, int, char *);
 extern	char	*__jff_allocate_array (int *, char *);
@@ -54,6 +54,8 @@ extern	char	*__get_thunk_link (char **, int);
 extern	char	*__get_switch_address (char **, int, char);
 extern	char	*__get_switch_link (char **, int);
 extern	double	read_real (int);
+int	raw_in	(int);
+int     raw_out (int fd, int val);
 #define	DOPE_BASE	2
 #define	true	1
 #define	false	0

runtime.c

@@ -186,7 +186,7 @@ int	no_of_el, i, ndims, el_size_o, el_size_n;;
 	   }
 	   return;
 	}
-//	when we are here, apperently, the types of value of src and dest are
+//	when we are here, apparently, the types of value of src and dest are
 //	different.
 //	But basically it is simple, either float -> int or int -> float
 	for (i = 0; i < no_of_el; i ++) {