From 8169a19b38c42588b39b21dae5bdb964e2f6b8c6 Mon Sep 17 00:00:00 2001 From: Alexei Sheplyakov Date: Sat, 23 Aug 2008 18:49:10 +0400 Subject: [PATCH] Use paths relative the `src' directory in the #include directives. Typical CLN source file starts with // General includes. #include "cl_sysdep.h" // Specification. #include "cl_2DS.h" // Implementation. #include "cl_2D.h" #include "cl_DS.h" It takes a while to figure out which files are included. So, use paths relative to the `src' directory, like this: // General includes. #include "base/cl_sysdep.h" // Specification. #include "src/base/digitseq/cl_2DS.h" // Implementation. #include "base/digit/cl_2D.h" #include "base/digitseq/cl_DS.h" This makes CLN less hacker hostile. --- src/Makefile.in | 5 +-- src/Makeflags | 3 -- src/base/Makeflags | 3 -- src/base/cl_N.h | 2 +- src/base/cl_alloca.cc | 6 ++-- src/base/cl_alloca.h | 2 +- src/base/cl_as_exception.cc | 4 +-- src/base/cl_condition.cc | 2 +- src/base/cl_d0_exception.cc | 2 +- src/base/cl_debug.cc | 2 +- src/base/cl_debugout.cc | 2 +- src/base/cl_free.cc | 2 +- src/base/cl_immclasses.cc | 2 +- src/base/cl_macros.h | 2 +- src/base/cl_malloc.cc | 2 +- src/base/cl_notreached_exception.cc | 4 +-- src/base/cl_sysdep.h | 2 +- src/base/cl_version.cc | 2 +- src/base/digit/Makeflags | 4 --- src/base/digit/cl_2D.h | 2 +- src/base/digit/cl_2D_div.cc | 4 +-- src/base/digit/cl_2D_exptpos.cc | 4 +-- src/base/digit/cl_D.h | 2 +- src/base/digitseq/Makeflags | 4 --- src/base/digitseq/cl_2DS_div.cc | 8 ++--- src/base/digitseq/cl_2DS_recip.cc | 8 ++--- src/base/digitseq/cl_DS.h | 12 +++---- src/base/digitseq/cl_DS_div.cc | 4 +-- src/base/digitseq/cl_DS_endian.h | 2 +- src/base/digitseq/cl_DS_mul.cc | 24 ++++++------- src/base/digitseq/cl_DS_random.cc | 8 ++--- src/base/digitseq/cl_DS_recip.cc | 4 +-- src/base/digitseq/cl_DS_recipsqrt.cc | 6 ++-- src/base/digitseq/cl_DS_sqrt.cc | 6 ++-- src/base/digitseq/cl_DS_trandom.cc | 8 ++--- src/base/digitseq/cl_asm.h | 2 +- src/base/digitseq/cl_asm_.cc | 2 +- src/base/hash/Makeflags | 4 --- src/base/hash/cl_hash.h | 2 +- src/base/hash/cl_hash1.h | 4 +-- src/base/hash/cl_hash1weak.h | 2 +- src/base/hash/cl_hash2.h | 4 +-- src/base/hash/cl_hash2weak.h | 2 +- src/base/hash/cl_hashset.h | 4 +-- src/base/hash/cl_hashuniq.h | 4 +-- src/base/hash/cl_hashuniqweak.h | 2 +- .../hash/cl_rcpointer2_hashweak_rcpointer.cc | 6 ++-- .../hash/cl_rcpointer2_hashweak_rcpointer.h | 2 +- .../hash/cl_rcpointer_hashweak_rcpointer.cc | 6 ++-- .../hash/cl_rcpointer_hashweak_rcpointer.h | 2 +- src/base/input/Makeflags | 4 --- .../input/cl_read_bad_syntax_exception.cc | 2 +- src/base/input/cl_read_eof_exception.cc | 2 +- src/base/input/cl_read_junk_exception.cc | 2 +- src/base/low/Makeflags | 4 --- src/base/low/cl_low_div.cc | 4 +-- src/base/low/cl_low_isqrt.cc | 4 +-- src/base/low/cl_low_isqrt2.cc | 4 +-- src/base/low/cl_low_mul.cc | 4 +-- src/base/output/Makeflags | 4 --- src/base/output/cl_output_dec.cc | 2 +- src/base/output/cl_output_hex.cc | 2 +- src/base/output/cl_prin_globals.cc | 2 +- src/base/proplist/Makeflags | 4 --- src/base/proplist/cl_pl_add.cc | 2 +- src/base/proplist/cl_pl_d.cc | 2 +- src/base/proplist/cl_pl_get.cc | 2 +- src/base/random/Makeflags | 4 --- src/base/random/cl_UL_random.cc | 4 +-- src/base/random/cl_random_def.cc | 2 +- src/base/random/cl_random_from.cc | 6 ++-- src/base/ring/Makeflags | 4 --- src/base/ring/cl_no_ring.cc | 2 +- src/base/ring/cl_ring_debug.cc | 2 +- src/base/string/Makeflags | 4 --- src/base/string/cl_spushstring.h | 2 +- src/base/string/cl_spushstring_append.cc | 4 +-- src/base/string/cl_spushstring_push.cc | 4 +-- src/base/string/cl_sstring.cc | 4 +-- src/base/string/cl_st_c2.cc | 2 +- src/base/string/cl_st_concat1.cc | 4 +-- src/base/string/cl_st_concat2.cc | 4 +-- src/base/string/cl_st_concat3.cc | 4 +-- src/base/string/cl_st_debug.cc | 2 +- src/base/string/cl_st_hashcode.cc | 2 +- src/base/string/cl_st_make0.cc | 4 +-- src/base/string/cl_st_make1.cc | 4 +-- src/base/string/cl_st_make2.cc | 4 +-- src/base/string/cl_st_null.cc | 2 +- src/base/string/input/Makeflags | 4 --- src/base/string/input/cl_st_get1.cc | 4 +-- src/base/string/input/cl_st_get2.cc | 4 +-- src/base/string/input/cl_st_getline1.cc | 4 +-- src/base/string/input/cl_st_getline2.cc | 4 +-- src/base/string/input/cl_st_gettoken.cc | 4 +-- src/base/string/misc/Makeflags | 4 --- src/base/string/misc/cl_st_class.cc | 2 +- src/base/string/output/Makeflags | 4 --- src/base/string/output/cl_st_print.cc | 2 +- src/base/symbol/Makeflags | 4 --- src/base/symbol/cl_sy_hashcode.cc | 4 +-- src/base/symbol/cl_symbol.cc | 4 +-- src/complex/Makeflags | 3 -- src/complex/algebraic/Makeflags | 4 --- src/complex/algebraic/cl_C_abs.cc | 8 ++--- src/complex/algebraic/cl_C_abs_aux.cc | 4 +-- src/complex/algebraic/cl_C_signum.cc | 8 ++--- src/complex/algebraic/cl_C_sqrt.cc | 4 +-- src/complex/algebraic/cl_DF_hypot.cc | 10 +++--- src/complex/algebraic/cl_FF_hypot.cc | 10 +++--- src/complex/algebraic/cl_LF_hypot.cc | 12 +++---- src/complex/algebraic/cl_R_hypot.cc | 18 +++++----- src/complex/algebraic/cl_SF_hypot.cc | 10 +++--- src/complex/cl_C.h | 2 +- src/complex/elem/Makeflags | 4 --- src/complex/elem/cl_C_equal.cc | 4 +-- src/complex/elem/cl_C_from_R_R_complex.cc | 4 +-- src/complex/elem/cl_C_from_R_R_complex1.cc | 6 ++-- src/complex/elem/cl_C_imagpart.cc | 4 +-- src/complex/elem/cl_C_minus.cc | 4 +-- src/complex/elem/cl_C_minus1.cc | 4 +-- src/complex/elem/cl_C_mul.cc | 4 +-- src/complex/elem/cl_C_plus.cc | 4 +-- src/complex/elem/cl_C_plus1.cc | 4 +-- src/complex/elem/cl_C_realpart.cc | 4 +-- src/complex/elem/cl_C_square.cc | 4 +-- src/complex/elem/cl_C_uminus.cc | 4 +-- src/complex/elem/cl_C_zerop.cc | 4 +-- src/complex/elem/division/Makeflags | 4 --- src/complex/elem/division/cl_C_DF_recip.cc | 6 ++-- src/complex/elem/division/cl_C_FF_recip.cc | 6 ++-- src/complex/elem/division/cl_C_LF_recip.cc | 8 ++--- src/complex/elem/division/cl_C_SF_recip.cc | 6 ++-- src/complex/elem/division/cl_C_div.cc | 4 +-- src/complex/elem/division/cl_C_recip.cc | 18 +++++----- src/complex/input/Makeflags | 4 --- src/complex/input/cl_N_from_string.cc | 2 +- src/complex/input/cl_N_read.cc | 8 ++--- src/complex/input/cl_N_read_stream.cc | 4 +-- src/complex/misc/Makeflags | 4 --- src/complex/misc/cl_C_class.cc | 4 +-- src/complex/misc/cl_C_conjugate.cc | 4 +-- src/complex/misc/cl_C_debug.cc | 2 +- src/complex/misc/cl_C_eqhashcode.cc | 6 ++-- src/complex/misc/cl_C_expt.cc | 4 +-- src/complex/misc/cl_C_expt_I.cc | 6 ++-- src/complex/misc/cl_N_as.cc | 4 +-- src/complex/output/Makeflags | 4 --- src/complex/output/cl_N_aprint.cc | 2 +- src/complex/output/cl_N_bprint.cc | 4 +-- src/complex/ring/Makeflags | 4 --- src/complex/ring/cl_C_ring.cc | 4 +-- src/complex/transcendental/Makeflags | 4 --- src/complex/transcendental/cl_C_acos.cc | 8 ++--- src/complex/transcendental/cl_C_acosh.cc | 12 +++---- src/complex/transcendental/cl_C_asin.cc | 4 +-- src/complex/transcendental/cl_C_asinh.cc | 4 +-- src/complex/transcendental/cl_C_asinh_aux.cc | 14 ++++---- src/complex/transcendental/cl_C_atan.cc | 4 +-- src/complex/transcendental/cl_C_atanh.cc | 4 +-- src/complex/transcendental/cl_C_atanh_aux.cc | 14 ++++---- src/complex/transcendental/cl_C_cis.cc | 4 +-- src/complex/transcendental/cl_C_cos.cc | 4 +-- src/complex/transcendental/cl_C_cosh.cc | 4 +-- src/complex/transcendental/cl_C_exp.cc | 4 +-- src/complex/transcendental/cl_C_expt_C.cc | 12 +++---- src/complex/transcendental/cl_C_log.cc | 6 ++-- src/complex/transcendental/cl_C_log2.cc | 8 ++--- src/complex/transcendental/cl_C_phase.cc | 4 +-- src/complex/transcendental/cl_C_sin.cc | 4 +-- src/complex/transcendental/cl_C_sinh.cc | 4 +-- src/complex/transcendental/cl_C_tan.cc | 4 +-- src/complex/transcendental/cl_C_tanh.cc | 4 +-- src/complex/transcendental/cl_R_cis.cc | 4 +-- src/float/Makeflags | 3 -- src/float/algebraic/Makeflags | 4 --- src/float/algebraic/cl_F_sqrt.cc | 4 +-- src/float/base/Makeflags | 4 --- src/float/base/cl_F_globals.cc | 2 +- src/float/base/cl_F_nan_exception.cc | 4 +-- src/float/base/cl_F_overflow_exception.cc | 4 +-- src/float/base/cl_F_underflow_exception.cc | 4 +-- src/float/cl_F.h | 2 +- src/float/conv/Makeflags | 4 --- src/float/conv/cl_DF_to_FF.cc | 8 ++--- src/float/conv/cl_DF_to_LF.cc | 12 +++---- src/float/conv/cl_DF_to_SF.cc | 8 ++--- src/float/conv/cl_DF_to_double.cc | 4 +-- src/float/conv/cl_DF_to_float.cc | 6 ++-- src/float/conv/cl_FF_to_DF.cc | 8 ++--- src/float/conv/cl_FF_to_LF.cc | 12 +++---- src/float/conv/cl_FF_to_SF.cc | 8 ++--- src/float/conv/cl_FF_to_double.cc | 6 ++-- src/float/conv/cl_FF_to_float.cc | 4 +-- src/float/conv/cl_F_from_F.cc | 6 ++-- src/float/conv/cl_F_from_F_f.cc | 4 +-- src/float/conv/cl_F_from_I.cc | 12 +++---- src/float/conv/cl_F_from_I_def.cc | 12 +++---- src/float/conv/cl_F_from_I_f.cc | 12 +++---- src/float/conv/cl_F_from_RA.cc | 12 +++---- src/float/conv/cl_F_from_RA_def.cc | 12 +++---- src/float/conv/cl_F_from_RA_f.cc | 12 +++---- src/float/conv/cl_F_to_DF.cc | 4 +-- src/float/conv/cl_F_to_FF.cc | 4 +-- src/float/conv/cl_F_to_LF.cc | 6 ++-- src/float/conv/cl_F_to_SF.cc | 4 +-- src/float/conv/cl_F_to_double.cc | 4 +-- src/float/conv/cl_F_to_float.cc | 4 +-- src/float/conv/cl_LF_to_DF.cc | 12 +++---- src/float/conv/cl_LF_to_FF.cc | 12 +++---- src/float/conv/cl_LF_to_SF.cc | 12 +++---- src/float/conv/cl_LF_to_double.cc | 10 +++--- src/float/conv/cl_LF_to_float.cc | 10 +++--- src/float/conv/cl_SF_to_DF.cc | 8 ++--- src/float/conv/cl_SF_to_FF.cc | 8 ++--- src/float/conv/cl_SF_to_LF.cc | 12 +++---- src/float/conv/cl_SF_to_double.cc | 6 ++-- src/float/conv/cl_SF_to_float.cc | 6 ++-- src/float/dfloat/Makeflags | 3 -- src/float/dfloat/algebraic/Makeflags | 4 --- src/float/dfloat/algebraic/cl_DF_sqrt.cc | 10 +++--- src/float/dfloat/cl_DF.h | 8 ++--- src/float/dfloat/conv/Makeflags | 4 --- src/float/dfloat/conv/cl_DF_from_double.cc | 4 +-- src/float/dfloat/conv/cl_DF_to_doublej.cc | 4 +-- src/float/dfloat/conv/cl_I_to_double.cc | 10 +++--- src/float/dfloat/conv/cl_RA_to_double.cc | 10 +++--- src/float/dfloat/division/Makeflags | 4 --- src/float/dfloat/division/cl_DF_ceil22.cc | 4 +-- src/float/dfloat/division/cl_DF_fceil.cc | 8 ++--- src/float/dfloat/division/cl_DF_floor22.cc | 4 +-- src/float/dfloat/division/cl_DF_recip.cc | 4 +-- src/float/dfloat/division/cl_DF_round22.cc | 4 +-- src/float/dfloat/division/cl_DF_trunc22.cc | 4 +-- src/float/dfloat/elem/Makeflags | 4 --- src/float/dfloat/elem/cl_DF_compare.cc | 4 +-- src/float/dfloat/elem/cl_DF_div.cc | 16 ++++----- src/float/dfloat/elem/cl_DF_ffloor.cc | 8 ++--- src/float/dfloat/elem/cl_DF_from_I.cc | 10 +++--- src/float/dfloat/elem/cl_DF_from_RA.cc | 10 +++--- src/float/dfloat/elem/cl_DF_fround.cc | 4 +-- src/float/dfloat/elem/cl_DF_ftrunc.cc | 4 +-- src/float/dfloat/elem/cl_DF_futrunc.cc | 4 +-- src/float/dfloat/elem/cl_DF_globals.cc | 4 +-- src/float/dfloat/elem/cl_DF_minus.cc | 4 +-- src/float/dfloat/elem/cl_DF_minusp.cc | 4 +-- src/float/dfloat/elem/cl_DF_mul.cc | 14 ++++---- src/float/dfloat/elem/cl_DF_plus.cc | 8 ++--- src/float/dfloat/elem/cl_DF_plusp.cc | 10 +++--- src/float/dfloat/elem/cl_DF_scale.cc | 6 ++-- src/float/dfloat/elem/cl_DF_scale_I.cc | 8 ++--- src/float/dfloat/elem/cl_DF_to_I.cc | 6 ++-- src/float/dfloat/elem/cl_DF_uminus.cc | 4 +-- src/float/dfloat/elem/cl_DF_zerop.cc | 4 +-- src/float/dfloat/input/Makeflags | 4 --- src/float/dfloat/input/cl_DF_from_string.cc | 2 +- src/float/dfloat/misc/Makeflags | 4 --- src/float/dfloat/misc/cl_DF_abs.cc | 6 ++-- src/float/dfloat/misc/cl_DF_as.cc | 4 +-- src/float/dfloat/misc/cl_DF_class.cc | 2 +- src/float/dfloat/misc/cl_DF_debug.cc | 2 +- src/float/dfloat/misc/cl_DF_decode.cc | 6 ++-- src/float/dfloat/misc/cl_DF_digits.cc | 4 +-- src/float/dfloat/misc/cl_DF_eqhashcode.cc | 6 ++-- src/float/dfloat/misc/cl_DF_exponent.cc | 4 +-- src/float/dfloat/misc/cl_DF_idecode.cc | 6 ++-- src/float/dfloat/misc/cl_DF_max.cc | 2 +- src/float/dfloat/misc/cl_DF_min.cc | 2 +- src/float/dfloat/misc/cl_DF_precision.cc | 8 ++--- src/float/dfloat/misc/cl_DF_sign.cc | 8 ++--- src/float/dfloat/misc/cl_DF_signum.cc | 10 +++--- src/float/division/Makeflags | 4 --- src/float/division/cl_F_ceil1.cc | 4 +-- src/float/division/cl_F_ceil2.cc | 12 +++---- src/float/division/cl_F_ceil22.cc | 4 +-- src/float/division/cl_F_fceil1.cc | 4 +-- src/float/division/cl_F_fceil2.cc | 6 ++-- src/float/division/cl_F_ffloor1.cc | 4 +-- src/float/division/cl_F_ffloor2.cc | 6 ++-- src/float/division/cl_F_floor1.cc | 4 +-- src/float/division/cl_F_floor2.cc | 12 +++---- src/float/division/cl_F_floor22.cc | 4 +-- src/float/division/cl_F_fround1.cc | 4 +-- src/float/division/cl_F_fround2.cc | 6 ++-- src/float/division/cl_F_ftrunc1.cc | 4 +-- src/float/division/cl_F_ftrunc2.cc | 6 ++-- src/float/division/cl_F_round1.cc | 4 +-- src/float/division/cl_F_round2.cc | 12 +++---- src/float/division/cl_F_round22.cc | 4 +-- src/float/division/cl_F_trunc1.cc | 4 +-- src/float/division/cl_F_trunc2.cc | 12 +++---- src/float/division/cl_F_trunc22.cc | 4 +-- src/float/elem/Makeflags | 4 --- src/float/elem/cl_F_I_div.cc | 14 ++++---- src/float/elem/cl_F_I_mul.cc | 14 ++++---- src/float/elem/cl_F_RA_div.cc | 14 ++++---- src/float/elem/cl_F_RA_mul.cc | 14 ++++---- src/float/elem/cl_F_compare.cc | 6 ++-- src/float/elem/cl_F_div.cc | 6 ++-- src/float/elem/cl_F_minus.cc | 6 ++-- src/float/elem/cl_F_minusp.cc | 14 ++++---- src/float/elem/cl_F_mul.cc | 6 ++-- src/float/elem/cl_F_plus.cc | 6 ++-- src/float/elem/cl_F_plusp.cc | 14 ++++---- src/float/elem/cl_F_recip.cc | 4 +-- src/float/elem/cl_F_scale.cc | 4 +-- src/float/elem/cl_F_scale_I.cc | 4 +-- src/float/elem/cl_F_square.cc | 4 +-- src/float/elem/cl_F_uminus.cc | 4 +-- src/float/elem/cl_F_zerop.cc | 14 ++++---- src/float/elem/cl_I_F_div.cc | 14 ++++---- src/float/elem/cl_RA_F_div.cc | 14 ++++---- src/float/ffloat/Makeflags | 3 -- src/float/ffloat/algebraic/Makeflags | 4 --- src/float/ffloat/algebraic/cl_FF_sqrt.cc | 8 ++--- src/float/ffloat/cl_FF.h | 8 ++--- src/float/ffloat/conv/Makeflags | 4 --- src/float/ffloat/conv/cl_FF_from_float.cc | 4 +-- src/float/ffloat/conv/cl_FF_to_floatj.cc | 4 +-- src/float/ffloat/conv/cl_I_to_float.cc | 10 +++--- src/float/ffloat/conv/cl_RA_to_float.cc | 10 +++--- src/float/ffloat/division/Makeflags | 4 --- src/float/ffloat/division/cl_FF_ceil22.cc | 4 +-- src/float/ffloat/division/cl_FF_fceil.cc | 8 ++--- src/float/ffloat/division/cl_FF_floor22.cc | 4 +-- src/float/ffloat/division/cl_FF_recip.cc | 4 +-- src/float/ffloat/division/cl_FF_round22.cc | 4 +-- src/float/ffloat/division/cl_FF_trunc22.cc | 4 +-- src/float/ffloat/elem/Makeflags | 4 --- src/float/ffloat/elem/cl_FF_compare.cc | 4 +-- src/float/ffloat/elem/cl_FF_div.cc | 14 ++++---- src/float/ffloat/elem/cl_FF_ffloor.cc | 8 ++--- src/float/ffloat/elem/cl_FF_from_I.cc | 10 +++--- src/float/ffloat/elem/cl_FF_from_RA.cc | 10 +++--- src/float/ffloat/elem/cl_FF_fround.cc | 4 +-- src/float/ffloat/elem/cl_FF_ftrunc.cc | 4 +-- src/float/ffloat/elem/cl_FF_futrunc.cc | 4 +-- src/float/ffloat/elem/cl_FF_globals.cc | 4 +-- src/float/ffloat/elem/cl_FF_minus.cc | 4 +-- src/float/ffloat/elem/cl_FF_minusp.cc | 4 +-- src/float/ffloat/elem/cl_FF_mul.cc | 12 +++---- src/float/ffloat/elem/cl_FF_plus.cc | 8 ++--- src/float/ffloat/elem/cl_FF_plusp.cc | 10 +++--- src/float/ffloat/elem/cl_FF_scale.cc | 6 ++-- src/float/ffloat/elem/cl_FF_scale_I.cc | 8 ++--- src/float/ffloat/elem/cl_FF_to_I.cc | 6 ++-- src/float/ffloat/elem/cl_FF_uminus.cc | 4 +-- src/float/ffloat/elem/cl_FF_zerop.cc | 4 +-- src/float/ffloat/input/Makeflags | 4 --- src/float/ffloat/input/cl_FF_from_string.cc | 2 +- src/float/ffloat/misc/Makeflags | 4 --- src/float/ffloat/misc/cl_FF_abs.cc | 6 ++-- src/float/ffloat/misc/cl_FF_as.cc | 4 +-- src/float/ffloat/misc/cl_FF_class.cc | 2 +- src/float/ffloat/misc/cl_FF_debug.cc | 2 +- src/float/ffloat/misc/cl_FF_decode.cc | 6 ++-- src/float/ffloat/misc/cl_FF_digits.cc | 4 +-- src/float/ffloat/misc/cl_FF_eqhashcode.cc | 6 ++-- src/float/ffloat/misc/cl_FF_exponent.cc | 4 +-- src/float/ffloat/misc/cl_FF_idecode.cc | 8 ++--- src/float/ffloat/misc/cl_FF_max.cc | 2 +- src/float/ffloat/misc/cl_FF_min.cc | 2 +- src/float/ffloat/misc/cl_FF_precision.cc | 8 ++--- src/float/ffloat/misc/cl_FF_sign.cc | 8 ++--- src/float/ffloat/misc/cl_FF_signum.cc | 10 +++--- src/float/input/Makeflags | 4 --- src/float/input/cl_F_from_string.cc | 2 +- src/float/input/cl_F_read.cc | 6 ++-- src/float/input/cl_F_read_stream.cc | 4 +-- src/float/input/cl_F_readparsed.cc | 16 ++++----- src/float/lfloat/Makeflags | 3 -- src/float/lfloat/algebraic/Makeflags | 4 --- src/float/lfloat/algebraic/cl_LF_sqrt.cc | 10 +++--- src/float/lfloat/cl_LF_impl.h | 6 ++-- src/float/lfloat/division/Makeflags | 4 --- src/float/lfloat/division/cl_LF_ceil22.cc | 4 +-- src/float/lfloat/division/cl_LF_fceil.cc | 8 ++--- src/float/lfloat/division/cl_LF_floor22.cc | 4 +-- src/float/lfloat/division/cl_LF_recip.cc | 6 ++-- src/float/lfloat/division/cl_LF_round22.cc | 4 +-- src/float/lfloat/division/cl_LF_trunc22.cc | 4 +-- src/float/lfloat/elem/Makeflags | 4 --- src/float/lfloat/elem/cl_I_LF_div.cc | 14 ++++---- src/float/lfloat/elem/cl_LF_1minus.cc | 8 ++--- src/float/lfloat/elem/cl_LF_1plus.cc | 12 +++---- src/float/lfloat/elem/cl_LF_2minus.cc | 4 +-- src/float/lfloat/elem/cl_LF_2plus.cc | 4 +-- src/float/lfloat/elem/cl_LF_I_div.cc | 14 ++++---- src/float/lfloat/elem/cl_LF_I_mul.cc | 12 +++---- src/float/lfloat/elem/cl_LF_RA_div.cc | 6 ++-- src/float/lfloat/elem/cl_LF_RA_mul.cc | 6 ++-- src/float/lfloat/elem/cl_LF_compare.cc | 10 +++--- src/float/lfloat/elem/cl_LF_div.cc | 12 +++---- src/float/lfloat/elem/cl_LF_ffloor.cc | 8 ++--- src/float/lfloat/elem/cl_LF_from_I.cc | 12 +++---- src/float/lfloat/elem/cl_LF_from_RA.cc | 12 +++---- src/float/lfloat/elem/cl_LF_fround.cc | 8 ++--- src/float/lfloat/elem/cl_LF_ftrunc.cc | 8 ++--- src/float/lfloat/elem/cl_LF_futrunc.cc | 8 ++--- src/float/lfloat/elem/cl_LF_globals.cc | 6 ++-- src/float/lfloat/elem/cl_LF_minus1.cc | 4 +-- src/float/lfloat/elem/cl_LF_minusp.cc | 4 +-- src/float/lfloat/elem/cl_LF_mul.cc | 10 +++--- src/float/lfloat/elem/cl_LF_plus1.cc | 4 +-- src/float/lfloat/elem/cl_LF_plusp.cc | 12 +++---- src/float/lfloat/elem/cl_LF_scale.cc | 8 ++--- src/float/lfloat/elem/cl_LF_scale_I.cc | 10 +++--- src/float/lfloat/elem/cl_LF_square.cc | 10 +++--- src/float/lfloat/elem/cl_LF_to_I.cc | 12 +++---- src/float/lfloat/elem/cl_LF_uminus.cc | 8 ++--- src/float/lfloat/elem/cl_LF_zerop.cc | 4 +-- src/float/lfloat/elem/cl_RA_LF_div.cc | 6 ++-- src/float/lfloat/input/Makeflags | 4 --- src/float/lfloat/input/cl_LF_from_string.cc | 2 +- src/float/lfloat/misc/Makeflags | 4 --- src/float/lfloat/misc/cl_LF_abs.cc | 6 ++-- src/float/lfloat/misc/cl_LF_as.cc | 4 +-- src/float/lfloat/misc/cl_LF_class.cc | 2 +- src/float/lfloat/misc/cl_LF_debug.cc | 2 +- src/float/lfloat/misc/cl_LF_decode.cc | 8 ++--- src/float/lfloat/misc/cl_LF_digits.cc | 4 +-- src/float/lfloat/misc/cl_LF_eqhashcode.cc | 8 ++--- src/float/lfloat/misc/cl_LF_exponent.cc | 4 +-- src/float/lfloat/misc/cl_LF_extend.cc | 8 ++--- src/float/lfloat/misc/cl_LF_idecode.cc | 8 ++--- src/float/lfloat/misc/cl_LF_leninc.cc | 4 +-- src/float/lfloat/misc/cl_LF_lenincx.cc | 4 +-- src/float/lfloat/misc/cl_LF_max.cc | 2 +- src/float/lfloat/misc/cl_LF_min.cc | 2 +- src/float/lfloat/misc/cl_LF_precision.cc | 8 ++--- src/float/lfloat/misc/cl_LF_shorten.cc | 10 +++--- src/float/lfloat/misc/cl_LF_shortenrel.cc | 12 +++---- src/float/lfloat/misc/cl_LF_shortenwith.cc | 12 +++---- src/float/lfloat/misc/cl_LF_sign.cc | 10 +++--- src/float/lfloat/misc/cl_LF_signum.cc | 12 +++---- src/float/lfloat/misc/cl_LF_to_LF.cc | 4 +-- src/float/misc/Makeflags | 4 --- src/float/misc/cl_F_abs.cc | 14 ++++---- src/float/misc/cl_F_as.cc | 4 +-- src/float/misc/cl_F_decode.cc | 16 ++++----- src/float/misc/cl_F_digits.cc | 14 ++++---- src/float/misc/cl_F_epsneg.cc | 14 ++++---- src/float/misc/cl_F_epspos.cc | 14 ++++---- src/float/misc/cl_F_eqhashcode.cc | 16 ++++----- src/float/misc/cl_F_exponent.cc | 14 ++++---- src/float/misc/cl_F_extendsqrt.cc | 8 ++--- src/float/misc/cl_F_extendsqrtx.cc | 8 ++--- src/float/misc/cl_F_idecode.cc | 14 ++++---- src/float/misc/cl_F_leastneg.cc | 14 ++++---- src/float/misc/cl_F_leastpos.cc | 14 ++++---- src/float/misc/cl_F_max.cc | 2 +- src/float/misc/cl_F_min.cc | 2 +- src/float/misc/cl_F_mostneg.cc | 14 ++++---- src/float/misc/cl_F_mostpos.cc | 14 ++++---- src/float/misc/cl_F_precision.cc | 14 ++++---- src/float/misc/cl_F_rational.cc | 4 +-- src/float/misc/cl_F_shortenrel.cc | 6 ++-- src/float/misc/cl_F_sign.cc | 14 ++++---- src/float/misc/cl_F_sign2.cc | 4 +-- src/float/misc/cl_F_signum.cc | 14 ++++---- src/float/misc/cl_float_format.cc | 2 +- src/float/output/Makeflags | 4 --- src/float/output/cl_F_aprint.cc | 2 +- src/float/output/cl_F_bprint.cc | 2 +- src/float/output/cl_F_cprint.cc | 2 +- src/float/output/cl_F_dprint.cc | 12 +++---- src/float/output/cl_F_printb.cc | 6 ++-- src/float/random/Makeflags | 4 --- src/float/random/cl_F_random.cc | 8 ++--- src/float/sfloat/Makeflags | 3 -- src/float/sfloat/algebraic/Makeflags | 4 --- src/float/sfloat/algebraic/cl_SF_sqrt.cc | 6 ++-- src/float/sfloat/cl_SF.h | 2 +- src/float/sfloat/division/Makeflags | 4 --- src/float/sfloat/division/cl_SF_ceil22.cc | 4 +-- src/float/sfloat/division/cl_SF_fceil.cc | 8 ++--- src/float/sfloat/division/cl_SF_ffloor.cc | 8 ++--- src/float/sfloat/division/cl_SF_floor22.cc | 4 +-- src/float/sfloat/division/cl_SF_recip.cc | 4 +-- src/float/sfloat/division/cl_SF_round22.cc | 4 +-- src/float/sfloat/division/cl_SF_trunc22.cc | 4 +-- src/float/sfloat/elem/Makeflags | 4 --- src/float/sfloat/elem/cl_SF_compare.cc | 6 ++-- src/float/sfloat/elem/cl_SF_div.cc | 8 ++--- src/float/sfloat/elem/cl_SF_from_I.cc | 8 ++--- src/float/sfloat/elem/cl_SF_from_RA.cc | 8 ++--- src/float/sfloat/elem/cl_SF_fround.cc | 4 +-- src/float/sfloat/elem/cl_SF_ftrunc.cc | 4 +-- src/float/sfloat/elem/cl_SF_futrunc.cc | 4 +-- src/float/sfloat/elem/cl_SF_minus.cc | 8 ++--- src/float/sfloat/elem/cl_SF_minusp.cc | 4 +-- src/float/sfloat/elem/cl_SF_mul.cc | 6 ++-- src/float/sfloat/elem/cl_SF_plus.cc | 6 ++-- src/float/sfloat/elem/cl_SF_plusp.cc | 10 +++--- src/float/sfloat/elem/cl_SF_scale.cc | 6 ++-- src/float/sfloat/elem/cl_SF_scale_I.cc | 8 ++--- src/float/sfloat/elem/cl_SF_to_I.cc | 6 ++-- src/float/sfloat/elem/cl_SF_uminus.cc | 8 ++--- src/float/sfloat/elem/cl_SF_zerop.cc | 4 +-- src/float/sfloat/input/Makeflags | 4 --- src/float/sfloat/input/cl_SF_from_string.cc | 2 +- src/float/sfloat/misc/Makeflags | 4 --- src/float/sfloat/misc/cl_SF_abs.cc | 6 ++-- src/float/sfloat/misc/cl_SF_as.cc | 4 +-- src/float/sfloat/misc/cl_SF_class.cc | 2 +- src/float/sfloat/misc/cl_SF_debug.cc | 2 +- src/float/sfloat/misc/cl_SF_decode.cc | 6 ++-- src/float/sfloat/misc/cl_SF_digits.cc | 4 +-- src/float/sfloat/misc/cl_SF_eqhashcode.cc | 6 ++-- src/float/sfloat/misc/cl_SF_exponent.cc | 4 +-- src/float/sfloat/misc/cl_SF_idecode.cc | 6 ++-- src/float/sfloat/misc/cl_SF_max.cc | 2 +- src/float/sfloat/misc/cl_SF_min.cc | 2 +- src/float/sfloat/misc/cl_SF_precision.cc | 8 ++--- src/float/sfloat/misc/cl_SF_sign.cc | 8 ++--- src/float/sfloat/misc/cl_SF_signum.cc | 10 +++--- src/float/transcendental/Makeflags | 4 --- src/float/transcendental/cl_F_atanhx.cc | 18 +++++----- src/float/transcendental/cl_F_atanx.cc | 18 +++++----- src/float/transcendental/cl_F_catalanconst.cc | 8 ++--- .../transcendental/cl_F_catalanconst_def.cc | 6 ++-- .../transcendental/cl_F_catalanconst_f.cc | 6 ++-- .../transcendental/cl_F_catalanconst_var.cc | 12 +++---- src/float/transcendental/cl_F_cos.cc | 8 ++--- src/float/transcendental/cl_F_cosh.cc | 8 ++--- src/float/transcendental/cl_F_coshsinh.cc | 8 ++--- src/float/transcendental/cl_F_cossin.cc | 8 ++--- src/float/transcendental/cl_F_eulerconst.cc | 8 ++--- .../transcendental/cl_F_eulerconst_def.cc | 6 ++-- src/float/transcendental/cl_F_eulerconst_f.cc | 6 ++-- .../transcendental/cl_F_eulerconst_var.cc | 12 +++---- src/float/transcendental/cl_F_exp.cc | 14 ++++---- src/float/transcendental/cl_F_exp1.cc | 8 ++--- src/float/transcendental/cl_F_exp1_def.cc | 6 ++-- src/float/transcendental/cl_F_exp1_f.cc | 6 ++-- src/float/transcendental/cl_F_exp1_var.cc | 12 +++---- src/float/transcendental/cl_F_expx.cc | 16 ++++----- src/float/transcendental/cl_F_ln.cc | 10 +++--- src/float/transcendental/cl_F_ln10.cc | 8 ++--- src/float/transcendental/cl_F_ln10_f.cc | 6 ++-- src/float/transcendental/cl_F_ln10_var.cc | 12 +++---- src/float/transcendental/cl_F_ln2.cc | 8 ++--- src/float/transcendental/cl_F_ln2_f.cc | 6 ++-- src/float/transcendental/cl_F_ln2_var.cc | 12 +++---- src/float/transcendental/cl_F_lnx.cc | 18 +++++----- src/float/transcendental/cl_F_pi.cc | 8 ++--- src/float/transcendental/cl_F_pi_def.cc | 6 ++-- src/float/transcendental/cl_F_pi_f.cc | 6 ++-- src/float/transcendental/cl_F_pi_var.cc | 12 +++---- src/float/transcendental/cl_F_roundpi.cc | 4 +-- src/float/transcendental/cl_F_roundpi2.cc | 4 +-- src/float/transcendental/cl_F_sin.cc | 8 ++--- src/float/transcendental/cl_F_sinh.cc | 8 ++--- src/float/transcendental/cl_F_sinhx.cc | 16 ++++----- src/float/transcendental/cl_F_sinx.cc | 16 ++++----- src/float/transcendental/cl_F_tan.cc | 2 +- src/float/transcendental/cl_F_tanh.cc | 2 +- src/float/transcendental/cl_F_zeta_int.cc | 8 ++--- src/float/transcendental/cl_F_zeta_int_def.cc | 8 ++--- src/float/transcendental/cl_F_zeta_int_f.cc | 8 ++--- src/float/transcendental/cl_LF_atan_recip.cc | 8 ++--- src/float/transcendental/cl_LF_atanh_recip.cc | 8 ++--- .../transcendental/cl_LF_catalanconst.cc | 10 +++--- src/float/transcendental/cl_LF_coshsinh.cc | 6 ++-- .../transcendental/cl_LF_coshsinh_aux.cc | 10 +++--- src/float/transcendental/cl_LF_cossin.cc | 6 ++-- src/float/transcendental/cl_LF_cossin_aux.cc | 10 +++--- src/float/transcendental/cl_LF_eulerconst.cc | 10 +++--- src/float/transcendental/cl_LF_exp1.cc | 8 ++--- src/float/transcendental/cl_LF_exp_aux.cc | 8 ++--- src/float/transcendental/cl_LF_ln10.cc | 6 ++-- src/float/transcendental/cl_LF_ln2.cc | 6 ++-- src/float/transcendental/cl_LF_pi.cc | 10 +++--- src/float/transcendental/cl_LF_ratseries_.cc | 6 ++-- src/float/transcendental/cl_LF_ratseries_a.cc | 6 ++-- .../transcendental/cl_LF_ratseries_ab.cc | 6 ++-- src/float/transcendental/cl_LF_ratseries_b.cc | 6 ++-- src/float/transcendental/cl_LF_ratseries_p.cc | 6 ++-- .../transcendental/cl_LF_ratseries_pa.cc | 6 ++-- .../transcendental/cl_LF_ratseries_pab.cc | 6 ++-- .../transcendental/cl_LF_ratseries_pb.cc | 6 ++-- .../transcendental/cl_LF_ratseries_pq.cc | 8 ++--- .../transcendental/cl_LF_ratseries_pqa.cc | 8 ++--- .../transcendental/cl_LF_ratseries_pqab.cc | 8 ++--- .../transcendental/cl_LF_ratseries_pqb.cc | 8 ++--- src/float/transcendental/cl_LF_ratseries_q.cc | 6 ++-- .../transcendental/cl_LF_ratseries_qa.cc | 6 ++-- .../transcendental/cl_LF_ratseries_qab.cc | 6 ++-- .../transcendental/cl_LF_ratseries_qb.cc | 6 ++-- .../transcendental/cl_LF_ratsumseries_pqcd.cc | 6 ++-- .../cl_LF_ratsumseries_pqcd_aux.cc | 4 +-- .../transcendental/cl_LF_ratsumseries_pqd.cc | 6 ++-- .../cl_LF_ratsumseries_pqd_aux.cc | 4 +-- src/float/transcendental/cl_LF_tran.h | 2 +- src/float/transcendental/cl_LF_zeta3.cc | 10 +++--- src/float/transcendental/cl_LF_zeta_int.cc | 10 +++--- src/integer/2adic/Makeflags | 4 --- src/integer/2adic/cl_I_2adic_div.cc | 8 ++--- src/integer/2adic/cl_I_2adic_recip.cc | 8 ++--- src/integer/Makeflags | 3 -- src/integer/algebraic/Makeflags | 4 --- src/integer/algebraic/cl_I_rootp.cc | 4 +-- src/integer/algebraic/cl_I_rootp_I.cc | 4 +-- src/integer/algebraic/cl_I_rootp_aux.cc | 10 +++--- src/integer/algebraic/cl_I_sqrt.cc | 6 ++-- src/integer/algebraic/cl_I_sqrtp.cc | 6 ++-- src/integer/bitwise/Makeflags | 4 --- src/integer/bitwise/cl_I_ash.cc | 6 ++-- src/integer/bitwise/cl_I_ash_I.cc | 6 ++-- src/integer/bitwise/cl_I_ash_exception.cc | 2 +- src/integer/bitwise/cl_I_boole.cc | 2 +- src/integer/bitwise/cl_I_dpb.cc | 4 +-- src/integer/bitwise/cl_I_dpf.cc | 4 +-- src/integer/bitwise/cl_I_fullbyte.cc | 6 ++-- src/integer/bitwise/cl_I_ilength.cc | 6 ++-- src/integer/bitwise/cl_I_ldb.cc | 6 ++-- src/integer/bitwise/cl_I_ldbtest.cc | 6 ++-- src/integer/bitwise/cl_I_ldbx.cc | 8 ++--- src/integer/bitwise/cl_I_ldbxtest.cc | 8 ++--- src/integer/bitwise/cl_I_log.h | 4 +-- src/integer/bitwise/cl_I_log_aux.cc | 8 ++--- src/integer/bitwise/cl_I_logand.cc | 8 ++--- src/integer/bitwise/cl_I_logandc2.cc | 8 ++--- src/integer/bitwise/cl_I_logbitp.cc | 6 ++-- src/integer/bitwise/cl_I_logbitp_I.cc | 6 ++-- src/integer/bitwise/cl_I_logcount.cc | 10 +++--- src/integer/bitwise/cl_I_logeqv.cc | 8 ++--- src/integer/bitwise/cl_I_logior.cc | 8 ++--- src/integer/bitwise/cl_I_lognand.cc | 8 ++--- src/integer/bitwise/cl_I_lognor.cc | 8 ++--- src/integer/bitwise/cl_I_lognot.cc | 8 ++--- src/integer/bitwise/cl_I_logorc2.cc | 8 ++--- src/integer/bitwise/cl_I_logtest.cc | 6 ++-- src/integer/bitwise/cl_I_logxor.cc | 8 ++--- src/integer/bitwise/cl_I_mkf.cc | 6 ++-- src/integer/bitwise/cl_I_mkfx.cc | 8 ++--- src/integer/cl_I.h | 6 ++-- src/integer/conv/Makeflags | 4 --- src/integer/conv/cl_I_cached_power.cc | 2 +- src/integer/conv/cl_I_cached_power.h | 4 +-- src/integer/conv/cl_I_digits_need.cc | 4 +-- src/integer/conv/cl_I_from_DS.cc | 10 +++--- src/integer/conv/cl_I_from_L.cc | 6 ++-- src/integer/conv/cl_I_from_L2.cc | 6 ++-- src/integer/conv/cl_I_from_NDS.cc | 6 ++-- src/integer/conv/cl_I_from_NUDS.cc | 10 +++--- src/integer/conv/cl_I_from_Q.cc | 6 ++-- src/integer/conv/cl_I_from_Q2.cc | 6 ++-- src/integer/conv/cl_I_from_UDS.cc | 10 +++--- src/integer/conv/cl_I_from_UL.cc | 6 ++-- src/integer/conv/cl_I_from_UL2.cc | 6 ++-- src/integer/conv/cl_I_from_UQ.cc | 6 ++-- src/integer/conv/cl_I_from_digits.cc | 8 ++--- src/integer/conv/cl_I_mul10plus.cc | 6 ++-- src/integer/conv/cl_I_to_L.cc | 6 ++-- src/integer/conv/cl_I_to_Q.cc | 6 ++-- src/integer/conv/cl_I_to_UL.cc | 6 ++-- src/integer/conv/cl_I_to_UQ.cc | 6 ++-- src/integer/conv/cl_I_to_digits.cc | 8 ++--- src/integer/division/Makeflags | 4 --- src/integer/division/cl_I_ceil1.cc | 4 +-- src/integer/division/cl_I_ceil2.cc | 4 +-- src/integer/division/cl_I_exquo.cc | 4 +-- src/integer/division/cl_I_exquo_exception.cc | 2 +- src/integer/division/cl_I_exquopos.cc | 4 +-- src/integer/division/cl_I_floor1.cc | 4 +-- src/integer/division/cl_I_floor2.cc | 4 +-- src/integer/division/cl_I_mod.cc | 4 +-- src/integer/division/cl_I_rem.cc | 4 +-- src/integer/division/cl_I_round1.cc | 4 +-- src/integer/division/cl_I_round2.cc | 4 +-- src/integer/division/cl_I_trunc1.cc | 4 +-- src/integer/division/cl_I_trunc2.cc | 4 +-- src/integer/elem/Makeflags | 4 --- src/integer/elem/cl_I_compare.cc | 6 ++-- src/integer/elem/cl_I_div.cc | 4 +-- src/integer/elem/cl_I_equal.cc | 6 ++-- src/integer/elem/cl_I_minus.cc | 6 ++-- src/integer/elem/cl_I_minus1.cc | 6 ++-- src/integer/elem/cl_I_minusp.cc | 4 +-- src/integer/elem/cl_I_mul.cc | 8 ++--- src/integer/elem/cl_I_plus.cc | 6 ++-- src/integer/elem/cl_I_plus1.cc | 6 ++-- src/integer/elem/cl_I_plusp.cc | 4 +-- src/integer/elem/cl_I_square.cc | 8 ++--- src/integer/elem/cl_I_uminus.cc | 6 ++-- src/integer/elem/cl_I_zerop.cc | 4 +-- src/integer/gcd/Makeflags | 4 --- src/integer/gcd/cl_I_gcd.cc | 10 +++--- src/integer/gcd/cl_I_gcd_aux.cc | 6 ++-- src/integer/gcd/cl_I_gcd_aux2.cc | 6 ++-- src/integer/gcd/cl_I_lcm.cc | 4 +-- src/integer/gcd/cl_I_xgcd.cc | 10 +++--- src/integer/gcd/cl_low_gcd.cc | 2 +- src/integer/hash/Makeflags | 4 --- src/integer/hash/cl_I_hash_gcobject.cc | 8 ++--- src/integer/hash/cl_I_hash_gcobject.h | 2 +- src/integer/hash/cl_I_hash_gcpointer.cc | 8 ++--- src/integer/hash/cl_I_hash_gcpointer.h | 2 +- src/integer/hash/cl_I_hash_pointer.cc | 8 ++--- src/integer/hash/cl_I_hash_pointer.h | 2 +- src/integer/hash/cl_I_hash_rcobject.cc | 8 ++--- src/integer/hash/cl_I_hash_rcobject.h | 2 +- src/integer/hash/cl_I_hash_rcpointer.cc | 8 ++--- src/integer/hash/cl_I_hash_rcpointer.h | 2 +- src/integer/hash/cl_I_hashcode.cc | 4 +-- src/integer/hash/cl_I_hashweak_rcpointer.cc | 8 ++--- src/integer/hash/cl_I_hashweak_rcpointer.h | 2 +- src/integer/input/Makeflags | 4 --- src/integer/input/cl_I_from_string.cc | 2 +- src/integer/input/cl_I_read.cc | 4 +-- src/integer/input/cl_I_read_stream.cc | 4 +-- src/integer/input/cl_I_readparsed.cc | 4 +-- src/integer/misc/Makeflags | 4 --- src/integer/misc/cl_BN_class.cc | 2 +- src/integer/misc/cl_FN_class.cc | 2 +- src/integer/misc/cl_I_abs.cc | 4 +-- src/integer/misc/cl_I_as.cc | 4 +-- src/integer/misc/cl_I_debug.cc | 2 +- src/integer/misc/cl_I_eqhashcode.cc | 6 ++-- src/integer/misc/cl_I_exptpos.cc | 2 +- src/integer/misc/cl_I_exptpos_I.cc | 4 +-- src/integer/misc/cl_I_max.cc | 2 +- src/integer/misc/cl_I_min.cc | 2 +- src/integer/misc/cl_I_oddp.cc | 6 ++-- src/integer/misc/cl_I_ord2.cc | 6 ++-- src/integer/misc/cl_I_power2p.cc | 6 ++-- src/integer/misc/cl_I_signum.cc | 4 +-- src/integer/misc/combin/Makeflags | 4 --- src/integer/misc/combin/cl_I_binomial.cc | 4 +-- .../misc/combin/cl_I_doublefactorial.cc | 6 ++-- src/integer/misc/combin/cl_I_factorial.cc | 6 ++-- src/integer/misc/combin/cl_I_factorial_aux.cc | 6 ++-- src/integer/output/Makeflags | 4 --- src/integer/output/cl_I_aprint.cc | 2 +- src/integer/output/cl_I_bprint.cc | 2 +- src/integer/output/cl_I_cprint.cc | 2 +- src/integer/output/cl_I_decstring.cc | 8 ++--- src/integer/output/cl_I_dprint.cc | 2 +- src/integer/output/cl_I_print.cc | 6 ++-- src/integer/output/cl_I_print_string.cc | 8 ++--- src/integer/random/Makeflags | 4 --- src/integer/random/cl_I_random.cc | 8 ++--- src/integer/random/cl_I_trandom.cc | 8 ++--- src/integer/ring/Makeflags | 4 --- src/integer/ring/cl_0_ring.cc | 2 +- src/integer/ring/cl_I_ring.cc | 4 +-- src/modinteger/Makeflags | 3 -- src/modinteger/cl_MI.cc | 36 +++++++++---------- src/modinteger/cl_MI_cond_composite.cc | 2 +- src/modinteger/cl_MI_debug.cc | 2 +- src/modinteger/cl_MI_err_comp.cc | 4 +-- src/modinteger/cl_MI_lshift.cc | 2 +- src/modinteger/cl_MI_rshift.cc | 4 +-- src/modpolynomial/Makeflags | 3 -- src/numtheory/Makeflags | 3 -- src/numtheory/cl_IF_millerrabin.cc | 4 +-- src/numtheory/cl_IF_smallprimes.cc | 4 +-- src/numtheory/cl_IF_trialdiv.cc | 6 ++-- src/numtheory/cl_IF_trialdiv1.cc | 6 ++-- src/numtheory/cl_IF_trialdiv2.cc | 6 ++-- src/numtheory/cl_nt_cornacchia1.cc | 4 +-- src/numtheory/cl_nt_cornacchia4.cc | 4 +-- src/numtheory/cl_nt_isprobprime.cc | 4 +-- src/numtheory/cl_nt_jacobi.cc | 6 ++-- src/numtheory/cl_nt_jacobi_low.cc | 4 +-- src/numtheory/cl_nt_nextprobprime.cc | 2 +- src/numtheory/cl_nt_sqrtmodp.cc | 4 +-- src/polynomial/Makeflags | 3 -- src/polynomial/elem/Makeflags | 5 --- src/polynomial/elem/cl_UP.cc | 4 +-- src/polynomial/elem/cl_UP_GF2.h | 2 +- src/polynomial/elem/cl_UP_named.cc | 6 ++-- src/polynomial/elem/cl_UP_no_ring.cc | 2 +- src/polynomial/elem/cl_UP_unnamed.cc | 6 ++-- src/polynomial/misc/Makeflags | 4 --- src/polynomial/misc/cl_UP_I_hermite.cc | 2 +- src/polynomial/misc/cl_UP_I_laguerre.cc | 2 +- src/polynomial/misc/cl_UP_I_tchebychev.cc | 2 +- src/polynomial/misc/cl_UP_RA_legendre.cc | 2 +- src/polynomial/misc/cl_UP_debug.cc | 4 +-- src/polynomial/misc/cl_UP_deriv.cc | 2 +- src/rational/Makeflags | 3 -- src/rational/algebraic/Makeflags | 4 --- src/rational/algebraic/cl_RA_rootp.cc | 4 +-- src/rational/algebraic/cl_RA_rootp_I.cc | 4 +-- src/rational/algebraic/cl_RA_sqrtp.cc | 4 +-- src/rational/cl_RA.h | 4 +-- src/rational/division/Makeflags | 4 --- src/rational/division/cl_RA_ceil1.cc | 4 +-- src/rational/division/cl_RA_ceil12.cc | 4 +-- src/rational/division/cl_RA_ceil2.cc | 4 +-- src/rational/division/cl_RA_ceil22.cc | 4 +-- src/rational/division/cl_RA_floor1.cc | 4 +-- src/rational/division/cl_RA_floor12.cc | 4 +-- src/rational/division/cl_RA_floor2.cc | 4 +-- src/rational/division/cl_RA_floor22.cc | 4 +-- src/rational/division/cl_RA_round1.cc | 4 +-- src/rational/division/cl_RA_round12.cc | 4 +-- src/rational/division/cl_RA_round2.cc | 4 +-- src/rational/division/cl_RA_round22.cc | 4 +-- src/rational/division/cl_RA_trunc1.cc | 4 +-- src/rational/division/cl_RA_trunc12.cc | 4 +-- src/rational/division/cl_RA_trunc2.cc | 4 +-- src/rational/division/cl_RA_trunc22.cc | 4 +-- src/rational/elem/Makeflags | 4 --- src/rational/elem/cl_RA_compare.cc | 4 +-- src/rational/elem/cl_RA_denominator.cc | 4 +-- src/rational/elem/cl_RA_div.cc | 4 +-- src/rational/elem/cl_RA_equal.cc | 4 +-- src/rational/elem/cl_RA_from_I_I_div.cc | 6 ++-- src/rational/elem/cl_RA_from_I_posI.cc | 6 ++-- src/rational/elem/cl_RA_from_I_posI1.cc | 4 +-- src/rational/elem/cl_RA_from_I_posI_div.cc | 6 ++-- src/rational/elem/cl_RA_minus.cc | 6 ++-- src/rational/elem/cl_RA_minus1.cc | 4 +-- src/rational/elem/cl_RA_minusp.cc | 4 +-- src/rational/elem/cl_RA_mul.cc | 6 ++-- src/rational/elem/cl_RA_numerator.cc | 4 +-- src/rational/elem/cl_RA_plus.cc | 6 ++-- src/rational/elem/cl_RA_plus1.cc | 4 +-- src/rational/elem/cl_RA_plusp.cc | 4 +-- src/rational/elem/cl_RA_recip.cc | 6 ++-- src/rational/elem/cl_RA_square.cc | 4 +-- src/rational/elem/cl_RA_uminus.cc | 4 +-- src/rational/elem/cl_RA_zerop.cc | 4 +-- src/rational/input/Makeflags | 4 --- src/rational/input/cl_RA_from_string.cc | 2 +- src/rational/input/cl_RA_read.cc | 4 +-- src/rational/input/cl_RA_read_stream.cc | 4 +-- src/rational/input/cl_RA_readparsed.cc | 8 ++--- src/rational/misc/Makeflags | 4 --- src/rational/misc/cl_RA_abs.cc | 4 +-- src/rational/misc/cl_RA_as.cc | 4 +-- src/rational/misc/cl_RA_class.cc | 4 +-- src/rational/misc/cl_RA_debug.cc | 2 +- src/rational/misc/cl_RA_eqhashcode.cc | 10 +++--- src/rational/misc/cl_RA_expt.cc | 2 +- src/rational/misc/cl_RA_expt_I.cc | 4 +-- src/rational/misc/cl_RA_exptpos.cc | 4 +-- src/rational/misc/cl_RA_exptpos_I.cc | 4 +-- src/rational/misc/cl_RA_max.cc | 2 +- src/rational/misc/cl_RA_min.cc | 2 +- src/rational/misc/cl_RA_signum.cc | 6 ++-- src/rational/output/Makeflags | 4 --- src/rational/output/cl_RA_aprint.cc | 2 +- src/rational/output/cl_RA_bprint.cc | 2 +- src/rational/output/cl_RA_cprint.cc | 2 +- src/rational/output/cl_RA_dprint.cc | 4 +-- src/rational/output/cl_RA_print.cc | 4 +-- src/rational/ring/Makeflags | 4 --- src/rational/ring/cl_RA_ring.cc | 4 +-- src/rational/transcendental/Makeflags | 4 --- src/rational/transcendental/cl_I_logp.cc | 8 ++--- src/rational/transcendental/cl_RA_logp.cc | 6 ++-- src/real/Makeflags | 3 -- src/real/algebraic/Makeflags | 4 --- src/real/algebraic/cl_RA_sqrt.cc | 2 +- src/real/algebraic/cl_R_sqrt.cc | 8 ++--- src/real/conv/Makeflags | 4 --- src/real/conv/cl_F_from_R.cc | 8 ++--- src/real/conv/cl_F_from_R_def.cc | 4 +-- src/real/conv/cl_F_from_R_f.cc | 6 ++-- src/real/conv/cl_R_to_DF.cc | 12 +++---- src/real/conv/cl_R_to_FF.cc | 12 +++---- src/real/conv/cl_R_to_LF.cc | 12 +++---- src/real/conv/cl_R_to_SF.cc | 12 +++---- src/real/conv/cl_R_to_double.cc | 10 +++--- src/real/conv/cl_R_to_float.cc | 10 +++--- src/real/division/Makeflags | 4 --- src/real/division/cl_R_ceil1.cc | 4 +-- src/real/division/cl_R_ceil12.cc | 4 +-- src/real/division/cl_R_ceil2.cc | 6 ++-- src/real/division/cl_R_ceil22.cc | 6 ++-- src/real/division/cl_R_div_t.h | 2 +- src/real/division/cl_R_fceil1.cc | 6 ++-- src/real/division/cl_R_fceil12.cc | 4 +-- src/real/division/cl_R_fceil2.cc | 12 +++---- src/real/division/cl_R_fceil22.cc | 6 ++-- src/real/division/cl_R_ffloor1.cc | 6 ++-- src/real/division/cl_R_ffloor12.cc | 4 +-- src/real/division/cl_R_ffloor2.cc | 12 +++---- src/real/division/cl_R_ffloor22.cc | 6 ++-- src/real/division/cl_R_floor1.cc | 4 +-- src/real/division/cl_R_floor12.cc | 4 +-- src/real/division/cl_R_floor2.cc | 6 ++-- src/real/division/cl_R_floor22.cc | 6 ++-- src/real/division/cl_R_fround1.cc | 6 ++-- src/real/division/cl_R_fround12.cc | 4 +-- src/real/division/cl_R_fround2.cc | 12 +++---- src/real/division/cl_R_fround22.cc | 6 ++-- src/real/division/cl_R_ftrunc1.cc | 6 ++-- src/real/division/cl_R_ftrunc12.cc | 4 +-- src/real/division/cl_R_ftrunc2.cc | 12 +++---- src/real/division/cl_R_ftrunc22.cc | 6 ++-- src/real/division/cl_R_mod.cc | 4 +-- src/real/division/cl_R_rem.cc | 4 +-- src/real/division/cl_R_round1.cc | 4 +-- src/real/division/cl_R_round12.cc | 4 +-- src/real/division/cl_R_round2.cc | 6 ++-- src/real/division/cl_R_round22.cc | 6 ++-- src/real/division/cl_R_trunc1.cc | 4 +-- src/real/division/cl_R_trunc12.cc | 4 +-- src/real/division/cl_R_trunc2.cc | 6 ++-- src/real/division/cl_R_trunc22.cc | 6 ++-- src/real/elem/Makeflags | 4 --- src/real/elem/cl_R_compare.cc | 4 +-- src/real/elem/cl_R_div.cc | 20 +++++------ src/real/elem/cl_R_equal.cc | 6 ++-- src/real/elem/cl_R_minus.cc | 4 +-- src/real/elem/cl_R_minus1.cc | 4 +-- src/real/elem/cl_R_minusp.cc | 20 +++++------ src/real/elem/cl_R_mul.cc | 20 +++++------ src/real/elem/cl_R_plus.cc | 4 +-- src/real/elem/cl_R_plus1.cc | 4 +-- src/real/elem/cl_R_plusp.cc | 2 +- src/real/elem/cl_R_recip.cc | 4 +-- src/real/elem/cl_R_square.cc | 8 ++--- src/real/elem/cl_R_uminus.cc | 8 ++--- src/real/elem/cl_R_zerop.cc | 20 +++++------ src/real/format-output/Makeflags | 4 --- src/real/format-output/cl_fmt_cardinal.cc | 4 +-- src/real/format-output/cl_fmt_floatstring.cc | 8 ++--- src/real/format-output/cl_fmt_integer.cc | 6 ++-- src/real/format-output/cl_fmt_newroman.cc | 4 +-- src/real/format-output/cl_fmt_oldroman.cc | 4 +-- src/real/format-output/cl_fmt_ordinal.cc | 4 +-- src/real/format-output/cl_fmt_paddedstring.cc | 4 +-- src/real/format-output/cl_fmt_scaleexp.cc | 14 ++++---- src/real/format-output/cl_fmt_tens.cc | 4 +-- src/real/input/Makeflags | 4 --- src/real/input/cl_R_from_string.cc | 2 +- src/real/input/cl_R_read.cc | 6 ++-- src/real/input/cl_R_read_stream.cc | 4 +-- src/real/misc/Makeflags | 4 --- src/real/misc/cl_R_abs.cc | 2 +- src/real/misc/cl_R_as.cc | 4 +-- src/real/misc/cl_R_contagion.cc | 6 ++-- src/real/misc/cl_R_debug.cc | 2 +- src/real/misc/cl_R_eqhashcode.cc | 28 +++++++-------- src/real/misc/cl_R_expt.cc | 4 +-- src/real/misc/cl_R_expt_I.cc | 6 ++-- src/real/misc/cl_R_max.cc | 2 +- src/real/misc/cl_R_min.cc | 2 +- src/real/misc/cl_R_rational.cc | 4 +-- src/real/misc/cl_R_rationalize.cc | 8 ++--- src/real/misc/cl_R_signum.cc | 20 +++++------ src/real/output/Makeflags | 4 --- src/real/output/cl_R_aprint.cc | 2 +- src/real/output/cl_R_bprint.cc | 2 +- src/real/output/cl_R_cprint.cc | 4 +-- src/real/random/Makeflags | 4 --- src/real/random/cl_R_random.cc | 6 ++-- src/real/ring/Makeflags | 4 --- src/real/ring/cl_R_ring.cc | 4 +-- src/real/transcendental/Makeflags | 4 --- src/real/transcendental/cl_R_atan.cc | 2 +- src/real/transcendental/cl_R_atan2.cc | 8 ++--- src/real/transcendental/cl_R_cos.cc | 4 +-- src/real/transcendental/cl_R_cosh.cc | 4 +-- src/real/transcendental/cl_R_coshsinh.cc | 4 +-- src/real/transcendental/cl_R_cossin.cc | 4 +-- src/real/transcendental/cl_R_exp.cc | 4 +-- src/real/transcendental/cl_R_ln.cc | 4 +-- src/real/transcendental/cl_R_log.cc | 6 ++-- src/real/transcendental/cl_R_sin.cc | 4 +-- src/real/transcendental/cl_R_sinh.cc | 4 +-- src/real/transcendental/cl_R_tan.cc | 2 +- src/real/transcendental/cl_R_tanh.cc | 2 +- src/timing/Makeflags | 3 -- src/timing/cl_t_c1.cc | 2 +- src/timing/cl_t_c2.cc | 2 +- src/timing/cl_t_current.cc | 4 +-- src/timing/cl_t_current2.cc | 4 +-- src/timing/cl_t_d.cc | 2 +- src/timing/cl_t_dec.cc | 2 +- src/timing/cl_t_inc.cc | 2 +- src/timing/cl_t_minus.cc | 2 +- src/timing/cl_t_report.cc | 2 +- src/timing/cl_t_td_minus.cc | 2 +- src/timing/cl_t_td_plus.cc | 2 +- src/vector/Makeflags | 3 -- src/vector/cl_GV_I.cc | 8 ++--- src/vector/cl_GV_I_copy.cc | 2 +- src/vector/cl_GV_I_debug.cc | 2 +- src/vector/cl_GV_number.cc | 4 +-- src/vector/cl_GV_number_copy.cc | 2 +- src/vector/cl_GV_number_debug.cc | 4 +-- src/vector/cl_SV_copy.cc | 2 +- src/vector/cl_SV_number.cc | 2 +- src/vector/cl_SV_number_debug.cc | 4 +-- src/vector/cl_SV_ringelt.cc | 2 +- src/vector/cl_SV_ringelt_debug.cc | 2 +- src/vector/output/Makeflags | 4 --- src/vector/output/cl_GV_number_aprint.cc | 4 +-- src/vector/output/cl_SV_aprint.cc | 2 +- src/vector/output/cl_SV_number_aprint.cc | 4 +-- 997 files changed, 2661 insertions(+), 3076 deletions(-) delete mode 100644 src/Makeflags delete mode 100644 src/base/Makeflags delete mode 100644 src/base/digit/Makeflags delete mode 100644 src/base/digitseq/Makeflags delete mode 100644 src/base/hash/Makeflags delete mode 100644 src/base/input/Makeflags delete mode 100644 src/base/low/Makeflags delete mode 100644 src/base/output/Makeflags delete mode 100644 src/base/proplist/Makeflags delete mode 100644 src/base/random/Makeflags delete mode 100644 src/base/ring/Makeflags delete mode 100644 src/base/string/Makeflags delete mode 100644 src/base/string/input/Makeflags delete mode 100644 src/base/string/misc/Makeflags delete mode 100644 src/base/string/output/Makeflags delete mode 100644 src/base/symbol/Makeflags delete mode 100644 src/complex/Makeflags delete mode 100644 src/complex/algebraic/Makeflags delete mode 100644 src/complex/elem/Makeflags delete mode 100644 src/complex/elem/division/Makeflags delete mode 100644 src/complex/input/Makeflags delete mode 100644 src/complex/misc/Makeflags delete mode 100644 src/complex/output/Makeflags delete mode 100644 src/complex/ring/Makeflags delete mode 100644 src/complex/transcendental/Makeflags delete mode 100644 src/float/Makeflags delete mode 100644 src/float/algebraic/Makeflags delete mode 100644 src/float/base/Makeflags delete mode 100644 src/float/conv/Makeflags delete mode 100644 src/float/dfloat/Makeflags delete mode 100644 src/float/dfloat/algebraic/Makeflags delete mode 100644 src/float/dfloat/conv/Makeflags delete mode 100644 src/float/dfloat/division/Makeflags delete mode 100644 src/float/dfloat/elem/Makeflags delete mode 100644 src/float/dfloat/input/Makeflags delete mode 100644 src/float/dfloat/misc/Makeflags delete mode 100644 src/float/division/Makeflags delete mode 100644 src/float/elem/Makeflags delete mode 100644 src/float/ffloat/Makeflags delete mode 100644 src/float/ffloat/algebraic/Makeflags delete mode 100644 src/float/ffloat/conv/Makeflags delete mode 100644 src/float/ffloat/division/Makeflags delete mode 100644 src/float/ffloat/elem/Makeflags delete mode 100644 src/float/ffloat/input/Makeflags delete mode 100644 src/float/ffloat/misc/Makeflags delete mode 100644 src/float/input/Makeflags delete mode 100644 src/float/lfloat/Makeflags delete mode 100644 src/float/lfloat/algebraic/Makeflags delete mode 100644 src/float/lfloat/division/Makeflags delete mode 100644 src/float/lfloat/elem/Makeflags delete mode 100644 src/float/lfloat/input/Makeflags delete mode 100644 src/float/lfloat/misc/Makeflags delete mode 100644 src/float/misc/Makeflags delete mode 100644 src/float/output/Makeflags delete mode 100644 src/float/random/Makeflags delete mode 100644 src/float/sfloat/Makeflags delete mode 100644 src/float/sfloat/algebraic/Makeflags delete mode 100644 src/float/sfloat/division/Makeflags delete mode 100644 src/float/sfloat/elem/Makeflags delete mode 100644 src/float/sfloat/input/Makeflags delete mode 100644 src/float/sfloat/misc/Makeflags delete mode 100644 src/float/transcendental/Makeflags delete mode 100644 src/integer/2adic/Makeflags delete mode 100644 src/integer/Makeflags delete mode 100644 src/integer/algebraic/Makeflags delete mode 100644 src/integer/bitwise/Makeflags delete mode 100644 src/integer/conv/Makeflags delete mode 100644 src/integer/division/Makeflags delete mode 100644 src/integer/elem/Makeflags delete mode 100644 src/integer/gcd/Makeflags delete mode 100644 src/integer/hash/Makeflags delete mode 100644 src/integer/input/Makeflags delete mode 100644 src/integer/misc/Makeflags delete mode 100644 src/integer/misc/combin/Makeflags delete mode 100644 src/integer/output/Makeflags delete mode 100644 src/integer/random/Makeflags delete mode 100644 src/integer/ring/Makeflags delete mode 100644 src/modinteger/Makeflags delete mode 100644 src/modpolynomial/Makeflags delete mode 100644 src/numtheory/Makeflags delete mode 100644 src/polynomial/Makeflags delete mode 100644 src/polynomial/elem/Makeflags delete mode 100644 src/polynomial/misc/Makeflags delete mode 100644 src/rational/Makeflags delete mode 100644 src/rational/algebraic/Makeflags delete mode 100644 src/rational/division/Makeflags delete mode 100644 src/rational/elem/Makeflags delete mode 100644 src/rational/input/Makeflags delete mode 100644 src/rational/misc/Makeflags delete mode 100644 src/rational/output/Makeflags delete mode 100644 src/rational/ring/Makeflags delete mode 100644 src/rational/transcendental/Makeflags delete mode 100644 src/real/Makeflags delete mode 100644 src/real/algebraic/Makeflags delete mode 100644 src/real/conv/Makeflags delete mode 100644 src/real/division/Makeflags delete mode 100644 src/real/elem/Makeflags delete mode 100644 src/real/format-output/Makeflags delete mode 100644 src/real/input/Makeflags delete mode 100644 src/real/misc/Makeflags delete mode 100644 src/real/output/Makeflags delete mode 100644 src/real/random/Makeflags delete mode 100644 src/real/ring/Makeflags delete mode 100644 src/real/transcendental/Makeflags delete mode 100644 src/timing/Makeflags delete mode 100644 src/vector/Makeflags delete mode 100644 src/vector/output/Makeflags diff --git a/src/Makefile.in b/src/Makefile.in index a91e401..11115e1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -27,7 +27,7 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I${top_srcdir}/include +INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src -I../include -I${top_srcdir}/include override CPPFLAGS += ${INCLUDES} LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -72,9 +72,6 @@ SUBDIR = . aux_srcdir = @srcdir@ VPATH = ${aux_srcdir}/${SUBDIR} -# Add subdirectory specific flags. -include ${srcdir}/${SUBDIR}/Makeflags -override CPPFLAGS += ${SUBDIR_INCLUDES} # Need to know the system name. SYSTEM := $(shell uname -s) diff --git a/src/Makeflags b/src/Makeflags deleted file mode 100644 index 4b0afee..0000000 --- a/src/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = diff --git a/src/base/Makeflags b/src/base/Makeflags deleted file mode 100644 index 2aab5c6..0000000 --- a/src/base/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/base diff --git a/src/base/cl_N.h b/src/base/cl_N.h index cf803e4..d946062 100644 --- a/src/base/cl_N.h +++ b/src/base/cl_N.h @@ -4,7 +4,7 @@ #define _CL_N_H #include "cln/number.h" -#include "cl_macros.h" +#include "base/cl_macros.h" namespace cln { diff --git a/src/base/cl_alloca.cc b/src/base/cl_alloca.cc index 9553347..be9f2b6 100644 --- a/src/base/cl_alloca.cc +++ b/src/base/cl_alloca.cc @@ -1,16 +1,16 @@ // cl_alloc_alloca_header(), cl_free_alloca_header(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_alloca.h" +#include "base/cl_alloca.h" // Implementation. #include "cln/malloc.h" -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/base/cl_alloca.h b/src/base/cl_alloca.h index e593be6..e7afe93 100644 --- a/src/base/cl_alloca.h +++ b/src/base/cl_alloca.h @@ -3,7 +3,7 @@ #ifndef _CL_ALLOCA_H #define _CL_ALLOCA_H -#include "cl_macros.h" +#include "base/cl_macros.h" #include namespace cln { diff --git a/src/base/cl_as_exception.cc b/src/base/cl_as_exception.cc index dcab70e..42713c2 100644 --- a/src/base/cl_as_exception.cc +++ b/src/base/cl_as_exception.cc @@ -1,7 +1,7 @@ // as_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/exception.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_N.h" +#include "base/cl_N.h" #include namespace cln { diff --git a/src/base/cl_condition.cc b/src/base/cl_condition.cc index 37bd311..804cf96 100644 --- a/src/base/cl_condition.cc +++ b/src/base/cl_condition.cc @@ -1,7 +1,7 @@ // Conditions. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/condition.h" diff --git a/src/base/cl_d0_exception.cc b/src/base/cl_d0_exception.cc index 7175709..d66853e 100644 --- a/src/base/cl_d0_exception.cc +++ b/src/base/cl_d0_exception.cc @@ -1,7 +1,7 @@ // division_by_0_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/exception.h" diff --git a/src/base/cl_debug.cc b/src/base/cl_debug.cc index 2998b65..6c034cd 100644 --- a/src/base/cl_debug.cc +++ b/src/base/cl_debug.cc @@ -1,7 +1,7 @@ // Debugging support for dynamic typing. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/object.h" diff --git a/src/base/cl_debugout.cc b/src/base/cl_debugout.cc index c195f8f..869652f 100644 --- a/src/base/cl_debugout.cc +++ b/src/base/cl_debugout.cc @@ -1,7 +1,7 @@ // Debugging stream. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/io.h" diff --git a/src/base/cl_free.cc b/src/base/cl_free.cc index 3ed2a17..3e788e9 100644 --- a/src/base/cl_free.cc +++ b/src/base/cl_free.cc @@ -1,7 +1,7 @@ // cl_free_heap_object(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/object.h" diff --git a/src/base/cl_immclasses.cc b/src/base/cl_immclasses.cc index b7d0513..8884b3e 100644 --- a/src/base/cl_immclasses.cc +++ b/src/base/cl_immclasses.cc @@ -1,7 +1,7 @@ // cl_immediate_classes. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/object.h" diff --git a/src/base/cl_macros.h b/src/base/cl_macros.h index 60a39e9..158398d 100644 --- a/src/base/cl_macros.h +++ b/src/base/cl_macros.h @@ -265,6 +265,6 @@ public: \ // it's a shame!) #define init1(type,lvalue) (void) new (&(lvalue)) type -#include "cl_maybe_inline.h" +#include "base/cl_maybe_inline.h" #endif /* _CL_MACROS_H */ diff --git a/src/base/cl_malloc.cc b/src/base/cl_malloc.cc index 981254e..639217d 100644 --- a/src/base/cl_malloc.cc +++ b/src/base/cl_malloc.cc @@ -1,7 +1,7 @@ // malloc_hook, free_hook. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/malloc.h" diff --git a/src/base/cl_notreached_exception.cc b/src/base/cl_notreached_exception.cc index a8cc7fe..c7ce2e4 100644 --- a/src/base/cl_notreached_exception.cc +++ b/src/base/cl_notreached_exception.cc @@ -1,10 +1,10 @@ // cl_notreached_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_macros.h" +#include "base/cl_macros.h" // Implementation. diff --git a/src/base/cl_sysdep.h b/src/base/cl_sysdep.h index d8f2575..081ef4c 100644 --- a/src/base/cl_sysdep.h +++ b/src/base/cl_sysdep.h @@ -53,7 +53,7 @@ #endif // Macros for internal use. -#include "cl_macros.h" +#include "base/cl_macros.h" // Elementary types. #include "cln/types.h" diff --git a/src/base/cl_version.cc b/src/base/cl_version.cc index 97116fc..6943534 100644 --- a/src/base/cl_version.cc +++ b/src/base/cl_version.cc @@ -1,7 +1,7 @@ // Version string buried into the library // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/version.h" diff --git a/src/base/digit/Makeflags b/src/base/digit/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/digit/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/digit/cl_2D.h b/src/base/digit/cl_2D.h index 273f966..c827f6e 100644 --- a/src/base/digit/cl_2D.h +++ b/src/base/digit/cl_2D.h @@ -4,7 +4,7 @@ #define _CL_2D_H #include "cln/types.h" -#include "cl_D.h" +#include "base/digit/cl_D.h" namespace cln { diff --git a/src/base/digit/cl_2D_div.cc b/src/base/digit/cl_2D_div.cc index ed28af4..c13e3a3 100644 --- a/src/base/digit/cl_2D_div.cc +++ b/src/base/digit/cl_2D_div.cc @@ -1,10 +1,10 @@ // div2adic(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_2D.h" +#include "base/digit/cl_2D.h" // Implementation. diff --git a/src/base/digit/cl_2D_exptpos.cc b/src/base/digit/cl_2D_exptpos.cc index 8e14f66..c863b21 100644 --- a/src/base/digit/cl_2D_exptpos.cc +++ b/src/base/digit/cl_2D_exptpos.cc @@ -1,10 +1,10 @@ // expt_pos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_2D.h" +#include "base/digit/cl_2D.h" // Implementation. diff --git a/src/base/digit/cl_D.h b/src/base/digit/cl_D.h index 8b92840..5aa861f 100644 --- a/src/base/digit/cl_D.h +++ b/src/base/digit/cl_D.h @@ -4,7 +4,7 @@ #define _CL_D_H #include "cln/types.h" -#include "cl_low.h" +#include "base/cl_low.h" // Aus cln/types.h importiere: // intDsize Anzahl Bits in einem Digit diff --git a/src/base/digitseq/Makeflags b/src/base/digitseq/Makeflags deleted file mode 100644 index bd82ef7..0000000 --- a/src/base/digitseq/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/digit -I$(srcdir)/base/random -Ibase diff --git a/src/base/digitseq/cl_2DS_div.cc b/src/base/digitseq/cl_2DS_div.cc index 30eed38..4a5f5ec 100644 --- a/src/base/digitseq/cl_2DS_div.cc +++ b/src/base/digitseq/cl_2DS_div.cc @@ -1,16 +1,16 @@ // div2adic(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_2DS.h" +#include "base/digitseq/cl_2DS.h" // Implementation. -#include "cl_2D.h" -#include "cl_DS.h" +#include "base/digit/cl_2D.h" +#include "base/digitseq/cl_DS.h" #include "cln/exception.h" namespace cln { diff --git a/src/base/digitseq/cl_2DS_recip.cc b/src/base/digitseq/cl_2DS_recip.cc index a6b96c8..8d615ec 100644 --- a/src/base/digitseq/cl_2DS_recip.cc +++ b/src/base/digitseq/cl_2DS_recip.cc @@ -1,16 +1,16 @@ // recip2adic(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_2DS.h" +#include "base/digitseq/cl_2DS.h" // Implementation. -#include "cl_2D.h" -#include "cl_DS.h" +#include "base/digit/cl_2D.h" +#include "base/digitseq/cl_DS.h" // Break-even point of the Newton iteration vs. standard div2adic. #if CL_USE_GMP diff --git a/src/base/digitseq/cl_DS.h b/src/base/digitseq/cl_DS.h index ee29df7..9543023 100644 --- a/src/base/digitseq/cl_DS.h +++ b/src/base/digitseq/cl_DS.h @@ -4,10 +4,10 @@ #define _CL_DS_H #include "cln/types.h" -#include "cl_gmpconfig.h" -#include "cl_D.h" -#include "cl_DS_endian.h" -#include "cl_alloca.h" +#include "base/cl_gmpconfig.h" +#include "base/digit/cl_D.h" +#include "base/digitseq/cl_DS_endian.h" +#include "base/cl_alloca.h" namespace cln { @@ -104,7 +104,7 @@ struct DS { // See which functions are defined as external functions. -#include "cl_asm.h" +#include "base/digitseq/cl_asm.h" // Declare the external functions. @@ -360,7 +360,7 @@ extern void shiftxor_loop_up (uintD* xptr, const uintD* yptr, uintC count, uintC #include // Argh, gmp.h includes which erases the definition of offsetof // that we have provided in cl_offsetof.h. Restore it. -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/base/digitseq/cl_DS_div.cc b/src/base/digitseq/cl_DS_div.cc index 7393dc8..86cb9c9 100644 --- a/src/base/digitseq/cl_DS_div.cc +++ b/src/base/digitseq/cl_DS_div.cc @@ -1,10 +1,10 @@ // cl_UDS_divide(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" // Implementation. diff --git a/src/base/digitseq/cl_DS_endian.h b/src/base/digitseq/cl_DS_endian.h index 0951ef2..c8d0b32 100644 --- a/src/base/digitseq/cl_DS_endian.h +++ b/src/base/digitseq/cl_DS_endian.h @@ -3,7 +3,7 @@ #ifndef _CL_DS_ENDIAN_H #define _CL_DS_ENDIAN_H -#include "cl_gmpconfig.h" +#include "base/cl_gmpconfig.h" // Set this to 1 for big-endian digit ordering in memory, // set this to 0 for little-endian digit ordering in memory. diff --git a/src/base/digitseq/cl_DS_mul.cc b/src/base/digitseq/cl_DS_mul.cc index 774edce..c3d3b5e 100644 --- a/src/base/digitseq/cl_DS_mul.cc +++ b/src/base/digitseq/cl_DS_mul.cc @@ -1,15 +1,15 @@ // cl_UDS_mul(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" // Implementation. -#include "cl_low.h" +#include "base/cl_low.h" #include "cln/malloc.h" #include "cln/exception.h" @@ -124,7 +124,7 @@ namespace cln { // Karatsuba-multiplication: O(n^(log 3 / log 2)) static void mulu_karatsuba_square (const uintD* sourceptr, uintC len, uintD* destptr); -#include "cl_DS_mul_kara.h" +#include "base/digitseq/cl_DS_mul_kara.h" // karatsuba_threshold = length, from which on Karatsuba-multiplication is a // gain and will be preferred. The break-even point is determined from // timings. The test is (progn (time (! 5000)) nil), which does many small @@ -169,7 +169,7 @@ namespace cln { #if 0 // Doesn't seem to be worth the effort // FFT-Multiplikation nach Nussbaumer: O(n log n log log n) -#include "cl_DS_mul_nuss.h" +#include "base/digitseq/cl_DS_mul_nuss.h" // nuss_threshold = Länge, ab der die Nussbaumer-Multiplikation bevorzugt // wird. Der Break-Even-Point bestimmt sich aus Zeitmessungen. // Multiplikation zweier N-Wort-Zahlen unter Linux mit einem 80486: @@ -183,7 +183,7 @@ namespace cln { int cl_nuss_threshold = 1000000; // FFT-Multiplikation in Z/pZ: O(n log n log log n) -#include "cl_DS_mul_fftp.h" +#include "base/digitseq/cl_DS_mul_fftp.h" // fftp_threshold = Länge, ab der die FFT-Multiplikation mod p bevorzugt // wird. Der Break-Even-Point bestimmt sich aus Zeitmessungen. // Multiplikation zweier N-Wort-Zahlen unter Linux mit einem 80486: @@ -198,7 +198,7 @@ namespace cln { // FFT-Multiplikation in Z/pZ: O(n log n log log n) // für drei verschiedene Primzahlen p1,p2,p3 < 2^32. -#include "cl_DS_mul_fftp3.h" +#include "base/digitseq/cl_DS_mul_fftp3.h" // fftp3_threshold = Länge, ab der die FFT-Multiplikation mod p_i bevorzugt // wird. Der Break-Even-Point bestimmt sich aus Zeitmessungen. // Multiplikation zweier N-Wort-Zahlen unter Linux mit einem 80486: @@ -215,7 +215,7 @@ namespace cln { // FFT-Multiplikation in Z/pZ: O(n log n log log n) // für drei verschiedene Primzahlen p1,p2,p3 < 2^32, // mit Montgomery-Multiplikation. -#include "cl_DS_mul_fftp3m.h" +#include "base/digitseq/cl_DS_mul_fftp3m.h" // fftp3_threshold = Länge, ab der die FFT-Multiplikation mod p_i bevorzugt // wird. Der Break-Even-Point bestimmt sich aus Zeitmessungen. // Multiplikation zweier N-Wort-Zahlen unter @@ -244,7 +244,7 @@ namespace cln { #endif // FFT-Multiplikation in Z/pZ: O(n^1.29) -#include "cl_DS_mul_fftm.h" +#include "base/digitseq/cl_DS_mul_fftm.h" // fftm_threshold = length, from which on FFT multiplication mod m is a gain // and will be preferred. The break-even point is determined from timings. // The times to multiply two N-limb numbers are: @@ -376,7 +376,7 @@ namespace cln { #if 0 // Doesn't seem to be worth the effort // FFT-Multiplikation über den komplexen Zahlen. -#include "cl_DS_mul_fftc.h" +#include "base/digitseq/cl_DS_mul_fftc.h" // Multiplikation zweier N-Wort-Zahlen unter // Linux mit einem i486 33 MHz // N kara/fftm fftc fftclong @@ -402,7 +402,7 @@ namespace cln { // 25000 2.3 (15MB) // FFT-Multiplikation über den komplexen Zahlen, Symmetrie ausnutzend. -#include "cl_DS_mul_fftcs.h" +#include "base/digitseq/cl_DS_mul_fftcs.h" // Multiplikation zweier N-Wort-Zahlen unter // Linux mit einem i486 33 MHz // N kara/fftm fftcs fftcslong @@ -445,7 +445,7 @@ namespace cln { #if 0 // Keine gute Fehlerabschätzung // FFT-Multiplikation über den komplexen Zahlen, mit reellen Zahlen rechnend. -#include "cl_DS_mul_fftr.h" +#include "base/digitseq/cl_DS_mul_fftr.h" // Multiplikation zweier N-Wort-Zahlen unter // Linux mit einem i486 33 MHz // N kara/fftm fftr fftrlong diff --git a/src/base/digitseq/cl_DS_random.cc b/src/base/digitseq/cl_DS_random.cc index a1d40f2..3893da0 100644 --- a/src/base/digitseq/cl_DS_random.cc +++ b/src/base/digitseq/cl_DS_random.cc @@ -1,17 +1,17 @@ // Digit sequence level random number generator. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_random_impl.h" +#include "base/random/cl_random_impl.h" // Implementation. #include "cln/random.h" -#include "cl_DS.h" -#include "cl_low.h" +#include "base/digitseq/cl_DS.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/base/digitseq/cl_DS_recip.cc b/src/base/digitseq/cl_DS_recip.cc index 67680ef..d22013b 100644 --- a/src/base/digitseq/cl_DS_recip.cc +++ b/src/base/digitseq/cl_DS_recip.cc @@ -1,10 +1,10 @@ // cl_UDS_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" // Implementation. diff --git a/src/base/digitseq/cl_DS_recipsqrt.cc b/src/base/digitseq/cl_DS_recipsqrt.cc index d68c5a1..a404ff4 100644 --- a/src/base/digitseq/cl_DS_recipsqrt.cc +++ b/src/base/digitseq/cl_DS_recipsqrt.cc @@ -1,15 +1,15 @@ // cl_UDS_recipsqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" // Implementation. -#include "cl_low.h" +#include "base/cl_low.h" #include "cln/exception.h" namespace cln { diff --git a/src/base/digitseq/cl_DS_sqrt.cc b/src/base/digitseq/cl_DS_sqrt.cc index e623664..1c6fb79 100644 --- a/src/base/digitseq/cl_DS_sqrt.cc +++ b/src/base/digitseq/cl_DS_sqrt.cc @@ -1,15 +1,15 @@ // cl_UDS_sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" // Implementation. -#include "cl_low.h" +#include "base/cl_low.h" #include "cln/exception.h" namespace cln { diff --git a/src/base/digitseq/cl_DS_trandom.cc b/src/base/digitseq/cl_DS_trandom.cc index 043d3be..7e2dd4c 100644 --- a/src/base/digitseq/cl_DS_trandom.cc +++ b/src/base/digitseq/cl_DS_trandom.cc @@ -1,17 +1,17 @@ // Digit sequence level random number generator. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_random_impl.h" +#include "base/random/cl_random_impl.h" // Implementation. #include "cln/random.h" -#include "cl_DS.h" -#include "cl_low.h" +#include "base/digitseq/cl_DS.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/base/digitseq/cl_asm.h b/src/base/digitseq/cl_asm.h index 61dc281..ccd1d23 100644 --- a/src/base/digitseq/cl_asm.h +++ b/src/base/digitseq/cl_asm.h @@ -1,7 +1,7 @@ // Includes the CPU specific cl_asm_*.h file. #include "cln/config.h" -#include "cl_DS_endian.h" +#include "base/digitseq/cl_DS_endian.h" #ifndef NO_ASM diff --git a/src/base/digitseq/cl_asm_.cc b/src/base/digitseq/cl_asm_.cc index df30863..87df666 100644 --- a/src/base/digitseq/cl_asm_.cc +++ b/src/base/digitseq/cl_asm_.cc @@ -1,7 +1,7 @@ // Includes the CPU specific cl_asm_*.cc file. #include "cln/config.h" -#include "cl_DS_endian.h" +#include "base/digitseq/cl_DS_endian.h" #ifndef NO_ASM diff --git a/src/base/hash/Makeflags b/src/base/hash/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/hash/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/hash/cl_hash.h b/src/base/hash/cl_hash.h index 92fbe8b..f211e9e 100644 --- a/src/base/hash/cl_hash.h +++ b/src/base/hash/cl_hash.h @@ -6,7 +6,7 @@ #include "cln/object.h" #include "cln/malloc.h" #include "cln/exception.h" -#include "cl_iterator.h" +#include "base/cl_iterator.h" namespace cln { diff --git a/src/base/hash/cl_hash1.h b/src/base/hash/cl_hash1.h index 0602880..417be1b 100644 --- a/src/base/hash/cl_hash1.h +++ b/src/base/hash/cl_hash1.h @@ -3,8 +3,8 @@ #ifndef _CL_HASH1_H #define _CL_HASH1_H -#include "cl_hash.h" -#include "cl_iterator.h" +#include "base/hash/cl_hash.h" +#include "base/cl_iterator.h" namespace cln { diff --git a/src/base/hash/cl_hash1weak.h b/src/base/hash/cl_hash1weak.h index 5766dd9..a8b835a 100644 --- a/src/base/hash/cl_hash1weak.h +++ b/src/base/hash/cl_hash1weak.h @@ -3,7 +3,7 @@ #ifndef _CL_HASH1WEAK_H #define _CL_HASH1WEAK_H -#include "cl_hash1.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/base/hash/cl_hash2.h b/src/base/hash/cl_hash2.h index da911a7..00eb866 100644 --- a/src/base/hash/cl_hash2.h +++ b/src/base/hash/cl_hash2.h @@ -3,8 +3,8 @@ #ifndef _CL_HASH2_H #define _CL_HASH2_H -#include "cl_hash.h" -#include "cl_iterator.h" +#include "base/hash/cl_hash.h" +#include "base/cl_iterator.h" namespace cln { diff --git a/src/base/hash/cl_hash2weak.h b/src/base/hash/cl_hash2weak.h index 5a2db45..58e517f 100644 --- a/src/base/hash/cl_hash2weak.h +++ b/src/base/hash/cl_hash2weak.h @@ -3,7 +3,7 @@ #ifndef _CL_HASH2WEAK_H #define _CL_HASH2WEAK_H -#include "cl_hash2.h" +#include "base/hash/cl_hash2.h" namespace cln { diff --git a/src/base/hash/cl_hashset.h b/src/base/hash/cl_hashset.h index 15ced7b..bff639c 100644 --- a/src/base/hash/cl_hashset.h +++ b/src/base/hash/cl_hashset.h @@ -3,8 +3,8 @@ #ifndef _CL_HASHSET_H #define _CL_HASHSET_H -#include "cl_hash.h" -#include "cl_iterator.h" +#include "base/hash/cl_hash.h" +#include "base/cl_iterator.h" namespace cln { diff --git a/src/base/hash/cl_hashuniq.h b/src/base/hash/cl_hashuniq.h index a5df68b..25fe4d2 100644 --- a/src/base/hash/cl_hashuniq.h +++ b/src/base/hash/cl_hashuniq.h @@ -3,8 +3,8 @@ #ifndef _CL_HASHUNIQ_H #define _CL_HASHUNIQ_H -#include "cl_hash.h" -#include "cl_iterator.h" +#include "base/hash/cl_hash.h" +#include "base/cl_iterator.h" namespace cln { diff --git a/src/base/hash/cl_hashuniqweak.h b/src/base/hash/cl_hashuniqweak.h index 79d6cc4..9b0a8a7 100644 --- a/src/base/hash/cl_hashuniqweak.h +++ b/src/base/hash/cl_hashuniqweak.h @@ -3,7 +3,7 @@ #ifndef _CL_HASHUNIQWEAK_H #define _CL_HASHUNIQWEAK_H -#include "cl_hashuniq.h" +#include "base/hash/cl_hashuniq.h" namespace cln { diff --git a/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc b/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc index 392cd4f..749e358 100644 --- a/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc +++ b/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc @@ -1,15 +1,15 @@ // class cl_wht_from_rcpointer2_to_rcpointer. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_rcpointer2_hashweak_rcpointer.h" +#include "base/hash/cl_rcpointer2_hashweak_rcpointer.h" // Implementation. -#include "cl_hash2weak.h" +#include "base/hash/cl_hash2weak.h" namespace cln { diff --git a/src/base/hash/cl_rcpointer2_hashweak_rcpointer.h b/src/base/hash/cl_rcpointer2_hashweak_rcpointer.h index 3fcd0c1..49eb6b3 100644 --- a/src/base/hash/cl_rcpointer2_hashweak_rcpointer.h +++ b/src/base/hash/cl_rcpointer2_hashweak_rcpointer.h @@ -5,7 +5,7 @@ #include "cln/object.h" -#include "cl_hash2weak.h" +#include "base/hash/cl_hash2weak.h" namespace cln { diff --git a/src/base/hash/cl_rcpointer_hashweak_rcpointer.cc b/src/base/hash/cl_rcpointer_hashweak_rcpointer.cc index c711d7e..31d7e23 100644 --- a/src/base/hash/cl_rcpointer_hashweak_rcpointer.cc +++ b/src/base/hash/cl_rcpointer_hashweak_rcpointer.cc @@ -1,15 +1,15 @@ // class cl_wht_from_rcpointer_to_rcpointer. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_rcpointer_hashweak_rcpointer.h" +#include "base/hash/cl_rcpointer_hashweak_rcpointer.h" // Implementation. -#include "cl_hash1weak.h" +#include "base/hash/cl_hash1weak.h" namespace cln { diff --git a/src/base/hash/cl_rcpointer_hashweak_rcpointer.h b/src/base/hash/cl_rcpointer_hashweak_rcpointer.h index 6616307..2026692 100644 --- a/src/base/hash/cl_rcpointer_hashweak_rcpointer.h +++ b/src/base/hash/cl_rcpointer_hashweak_rcpointer.h @@ -5,7 +5,7 @@ #include "cln/object.h" -#include "cl_hash1weak.h" +#include "base/hash/cl_hash1weak.h" namespace cln { diff --git a/src/base/input/Makeflags b/src/base/input/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/input/cl_read_bad_syntax_exception.cc b/src/base/input/cl_read_bad_syntax_exception.cc index 8b7928f..bab6f21 100644 --- a/src/base/input/cl_read_bad_syntax_exception.cc +++ b/src/base/input/cl_read_bad_syntax_exception.cc @@ -1,7 +1,7 @@ // read_number_bad_syntax_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/number_io.h" diff --git a/src/base/input/cl_read_eof_exception.cc b/src/base/input/cl_read_eof_exception.cc index db9e202..3bd01d6 100644 --- a/src/base/input/cl_read_eof_exception.cc +++ b/src/base/input/cl_read_eof_exception.cc @@ -1,7 +1,7 @@ // read_number_eof_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/number_io.h" diff --git a/src/base/input/cl_read_junk_exception.cc b/src/base/input/cl_read_junk_exception.cc index 85640c0..d704621 100644 --- a/src/base/input/cl_read_junk_exception.cc +++ b/src/base/input/cl_read_junk_exception.cc @@ -1,7 +1,7 @@ // read_number_junk_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/number_io.h" diff --git a/src/base/low/Makeflags b/src/base/low/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/low/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/low/cl_low_div.cc b/src/base/low/cl_low_div.cc index b2c7544..c170087 100644 --- a/src/base/low/cl_low_div.cc +++ b/src/base/low/cl_low_div.cc @@ -1,10 +1,10 @@ // Low level: division. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_low.h" +#include "base/cl_low.h" // Implementation. diff --git a/src/base/low/cl_low_isqrt.cc b/src/base/low/cl_low_isqrt.cc index 19e5752..b9fb99c 100644 --- a/src/base/low/cl_low_isqrt.cc +++ b/src/base/low/cl_low_isqrt.cc @@ -1,10 +1,10 @@ // isqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_low.h" +#include "base/cl_low.h" // Implementation. diff --git a/src/base/low/cl_low_isqrt2.cc b/src/base/low/cl_low_isqrt2.cc index ccb06ff..06cac31 100644 --- a/src/base/low/cl_low_isqrt2.cc +++ b/src/base/low/cl_low_isqrt2.cc @@ -1,10 +1,10 @@ // isqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_low.h" +#include "base/cl_low.h" // Implementation. diff --git a/src/base/low/cl_low_mul.cc b/src/base/low/cl_low_mul.cc index 2807f12..75eb3af 100644 --- a/src/base/low/cl_low_mul.cc +++ b/src/base/low/cl_low_mul.cc @@ -1,10 +1,10 @@ // Low level: multiplication. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_low.h" +#include "base/cl_low.h" // Implementation. diff --git a/src/base/output/Makeflags b/src/base/output/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/output/cl_output_dec.cc b/src/base/output/cl_output_dec.cc index 99ea457..f39edc7 100644 --- a/src/base/output/cl_output_dec.cc +++ b/src/base/output/cl_output_dec.cc @@ -1,7 +1,7 @@ // fprintdecimal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/io.h" diff --git a/src/base/output/cl_output_hex.cc b/src/base/output/cl_output_hex.cc index 57b1ed1..ea3888b 100644 --- a/src/base/output/cl_output_hex.cc +++ b/src/base/output/cl_output_hex.cc @@ -1,7 +1,7 @@ // fprinthexadecimal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/io.h" diff --git a/src/base/output/cl_prin_globals.cc b/src/base/output/cl_prin_globals.cc index fd61467..13f7a23 100644 --- a/src/base/output/cl_prin_globals.cc +++ b/src/base/output/cl_prin_globals.cc @@ -1,7 +1,7 @@ // Global variables in CLN // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/output.h" diff --git a/src/base/proplist/Makeflags b/src/base/proplist/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/proplist/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/proplist/cl_pl_add.cc b/src/base/proplist/cl_pl_add.cc index 47e88e6..0d2185d 100644 --- a/src/base/proplist/cl_pl_add.cc +++ b/src/base/proplist/cl_pl_add.cc @@ -1,7 +1,7 @@ // class cl_property_list. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/proplist.h" diff --git a/src/base/proplist/cl_pl_d.cc b/src/base/proplist/cl_pl_d.cc index b60c841..b2a4bc2 100644 --- a/src/base/proplist/cl_pl_d.cc +++ b/src/base/proplist/cl_pl_d.cc @@ -1,7 +1,7 @@ // class cl_property_list. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/proplist.h" diff --git a/src/base/proplist/cl_pl_get.cc b/src/base/proplist/cl_pl_get.cc index c1f2e12..86efb46 100644 --- a/src/base/proplist/cl_pl_get.cc +++ b/src/base/proplist/cl_pl_get.cc @@ -1,7 +1,7 @@ // class cl_property_list. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/proplist.h" diff --git a/src/base/random/Makeflags b/src/base/random/Makeflags deleted file mode 100644 index 7b9d182..0000000 --- a/src/base/random/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += -Ibase diff --git a/src/base/random/cl_UL_random.cc b/src/base/random/cl_UL_random.cc index 7ff6ede..2c39c4b 100644 --- a/src/base/random/cl_UL_random.cc +++ b/src/base/random/cl_UL_random.cc @@ -1,7 +1,7 @@ // Word level random number generator. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/random.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_low.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/base/random/cl_random_def.cc b/src/base/random/cl_random_def.cc index 9728273..07527eb 100644 --- a/src/base/random/cl_random_def.cc +++ b/src/base/random/cl_random_def.cc @@ -1,7 +1,7 @@ // default_random_state. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/random.h" diff --git a/src/base/random/cl_random_from.cc b/src/base/random/cl_random_from.cc index 2e91b7a..22d48b6 100644 --- a/src/base/random/cl_random_from.cc +++ b/src/base/random/cl_random_from.cc @@ -6,7 +6,7 @@ #endif // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/random.h" @@ -14,8 +14,8 @@ // Implementation. -#include "cl_base_config.h" -#include "cl_low.h" +#include "base/cl_base_config.h" +#include "base/cl_low.h" #include // declares rand() #if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) diff --git a/src/base/ring/Makeflags b/src/base/ring/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/ring/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/ring/cl_no_ring.cc b/src/base/ring/cl_no_ring.cc index 88e76e7..d15be0f 100644 --- a/src/base/ring/cl_no_ring.cc +++ b/src/base/ring/cl_no_ring.cc @@ -1,7 +1,7 @@ // Dummy ring. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ring.h" diff --git a/src/base/ring/cl_ring_debug.cc b/src/base/ring/cl_ring_debug.cc index 35fe61e..88b5cd5 100644 --- a/src/base/ring/cl_ring_debug.cc +++ b/src/base/ring/cl_ring_debug.cc @@ -1,7 +1,7 @@ // cl_ring debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ring.h" diff --git a/src/base/string/Makeflags b/src/base/string/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/string/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/string/cl_spushstring.h b/src/base/string/cl_spushstring.h index eaae52e..67429e0 100644 --- a/src/base/string/cl_spushstring.h +++ b/src/base/string/cl_spushstring.h @@ -5,7 +5,7 @@ #include "cln/object.h" #include "cln/malloc.h" -#include "cl_sstring.h" +#include "base/string/cl_sstring.h" #include "cln/exception.h" namespace cln { diff --git a/src/base/string/cl_spushstring_append.cc b/src/base/string/cl_spushstring_append.cc index 8f36f49..3dd54a8 100644 --- a/src/base/string/cl_spushstring_append.cc +++ b/src/base/string/cl_spushstring_append.cc @@ -1,10 +1,10 @@ // class cl_spushstring. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" // Implementation. diff --git a/src/base/string/cl_spushstring_push.cc b/src/base/string/cl_spushstring_push.cc index 336c75e..167ff1b 100644 --- a/src/base/string/cl_spushstring_push.cc +++ b/src/base/string/cl_spushstring_push.cc @@ -1,10 +1,10 @@ // class cl_spushstring. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" // Implementation. diff --git a/src/base/string/cl_sstring.cc b/src/base/string/cl_sstring.cc index b0bc2cd..f052cae 100644 --- a/src/base/string/cl_sstring.cc +++ b/src/base/string/cl_sstring.cc @@ -1,10 +1,10 @@ // cl_sstring(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_sstring.h" +#include "base/string/cl_sstring.h" // Implementation. diff --git a/src/base/string/cl_st_c2.cc b/src/base/string/cl_st_c2.cc index 0adc918..40081c3 100644 --- a/src/base/string/cl_st_c2.cc +++ b/src/base/string/cl_st_c2.cc @@ -1,7 +1,7 @@ // constructor cl_string (const char * s). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" diff --git a/src/base/string/cl_st_concat1.cc b/src/base/string/cl_st_concat1.cc index ff3c19a..c4d34fd 100644 --- a/src/base/string/cl_st_concat1.cc +++ b/src/base/string/cl_st_concat1.cc @@ -1,14 +1,14 @@ // cl_string concatenation. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" // Implementation. -#include "cl_st_make0.h" +#include "base/string/cl_st_make0.h" namespace cln { diff --git a/src/base/string/cl_st_concat2.cc b/src/base/string/cl_st_concat2.cc index 165ea28..ea4efce 100644 --- a/src/base/string/cl_st_concat2.cc +++ b/src/base/string/cl_st_concat2.cc @@ -1,14 +1,14 @@ // cl_string concatenation. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" // Implementation. -#include "cl_st_make0.h" +#include "base/string/cl_st_make0.h" namespace cln { diff --git a/src/base/string/cl_st_concat3.cc b/src/base/string/cl_st_concat3.cc index 262b481..05fb828 100644 --- a/src/base/string/cl_st_concat3.cc +++ b/src/base/string/cl_st_concat3.cc @@ -1,14 +1,14 @@ // cl_string concatenation. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" // Implementation. -#include "cl_st_make0.h" +#include "base/string/cl_st_make0.h" namespace cln { diff --git a/src/base/string/cl_st_debug.cc b/src/base/string/cl_st_debug.cc index 7a7a05c..e5ceff1 100644 --- a/src/base/string/cl_st_debug.cc +++ b/src/base/string/cl_st_debug.cc @@ -1,7 +1,7 @@ // cl_string debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/base/string/cl_st_hashcode.cc b/src/base/string/cl_st_hashcode.cc index f2da3b4..b67cb64 100644 --- a/src/base/string/cl_st_hashcode.cc +++ b/src/base/string/cl_st_hashcode.cc @@ -1,7 +1,7 @@ // cln/string.hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" diff --git a/src/base/string/cl_st_make0.cc b/src/base/string/cl_st_make0.cc index 8b29342..14f6c93 100644 --- a/src/base/string/cl_st_make0.cc +++ b/src/base/string/cl_st_make0.cc @@ -1,7 +1,7 @@ // cl_make_heap_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/malloc.h" -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/base/string/cl_st_make1.cc b/src/base/string/cl_st_make1.cc index be96128..bda86be 100644 --- a/src/base/string/cl_st_make1.cc +++ b/src/base/string/cl_st_make1.cc @@ -1,7 +1,7 @@ // cl_make_heap_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/malloc.h" -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/base/string/cl_st_make2.cc b/src/base/string/cl_st_make2.cc index 1599e2b..98df935 100644 --- a/src/base/string/cl_st_make2.cc +++ b/src/base/string/cl_st_make2.cc @@ -1,7 +1,7 @@ // cl_make_heap_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/malloc.h" -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/base/string/cl_st_null.cc b/src/base/string/cl_st_null.cc index 3ba0fb4..c808b44 100644 --- a/src/base/string/cl_st_null.cc +++ b/src/base/string/cl_st_null.cc @@ -1,7 +1,7 @@ // cl_null_string. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" diff --git a/src/base/string/input/Makeflags b/src/base/string/input/Makeflags deleted file mode 100644 index c1c9b6f..0000000 --- a/src/base/string/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/string diff --git a/src/base/string/input/cl_st_get1.cc b/src/base/string/input/cl_st_get1.cc index 8524e7d..917ecc4 100644 --- a/src/base/string/input/cl_st_get1.cc +++ b/src/base/string/input/cl_st_get1.cc @@ -1,7 +1,7 @@ // cl_fget(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/base/string/input/cl_st_get2.cc b/src/base/string/input/cl_st_get2.cc index 8ef1e26..d89f3e4 100644 --- a/src/base/string/input/cl_st_get2.cc +++ b/src/base/string/input/cl_st_get2.cc @@ -1,7 +1,7 @@ // cl_fget(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/base/string/input/cl_st_getline1.cc b/src/base/string/input/cl_st_getline1.cc index 8ceb2da..5f9ac88 100644 --- a/src/base/string/input/cl_st_getline1.cc +++ b/src/base/string/input/cl_st_getline1.cc @@ -1,7 +1,7 @@ // cl_fgetline(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/base/string/input/cl_st_getline2.cc b/src/base/string/input/cl_st_getline2.cc index cfdc695..d2316e0 100644 --- a/src/base/string/input/cl_st_getline2.cc +++ b/src/base/string/input/cl_st_getline2.cc @@ -1,7 +1,7 @@ // cl_fgetline(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/base/string/input/cl_st_gettoken.cc b/src/base/string/input/cl_st_gettoken.cc index e845c13..30e7817 100644 --- a/src/base/string/input/cl_st_gettoken.cc +++ b/src/base/string/input/cl_st_gettoken.cc @@ -1,7 +1,7 @@ // operator>>. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" #include namespace cln { diff --git a/src/base/string/misc/Makeflags b/src/base/string/misc/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/string/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/string/misc/cl_st_class.cc b/src/base/string/misc/cl_st_class.cc index 0cf9a1a..0fbeedc 100644 --- a/src/base/string/misc/cl_st_class.cc +++ b/src/base/string/misc/cl_st_class.cc @@ -1,7 +1,7 @@ // cl_class_string. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" diff --git a/src/base/string/output/Makeflags b/src/base/string/output/Makeflags deleted file mode 100644 index c329293..0000000 --- a/src/base/string/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += diff --git a/src/base/string/output/cl_st_print.cc b/src/base/string/output/cl_st_print.cc index 5d3fa99..91a69ec 100644 --- a/src/base/string/output/cl_st_print.cc +++ b/src/base/string/output/cl_st_print.cc @@ -1,7 +1,7 @@ // fprint(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/string.h" diff --git a/src/base/symbol/Makeflags b/src/base/symbol/Makeflags deleted file mode 100644 index 49dde1c..0000000 --- a/src/base/symbol/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/hash diff --git a/src/base/symbol/cl_sy_hashcode.cc b/src/base/symbol/cl_sy_hashcode.cc index a318221..8dcb79b 100644 --- a/src/base/symbol/cl_sy_hashcode.cc +++ b/src/base/symbol/cl_sy_hashcode.cc @@ -1,7 +1,7 @@ // cln/symbol.hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/symbol.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/base/symbol/cl_symbol.cc b/src/base/symbol/cl_symbol.cc index 84d45bd..f80f58f 100644 --- a/src/base/symbol/cl_symbol.cc +++ b/src/base/symbol/cl_symbol.cc @@ -1,7 +1,7 @@ // class cl_symbol. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/symbol.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_hashuniqweak.h" +#include "base/hash/cl_hashuniqweak.h" namespace cln { diff --git a/src/complex/Makeflags b/src/complex/Makeflags deleted file mode 100644 index b536845..0000000 --- a/src/complex/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/complex -I$(srcdir)/base diff --git a/src/complex/algebraic/Makeflags b/src/complex/algebraic/Makeflags deleted file mode 100644 index e7754d7..0000000 --- a/src/complex/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat/elem -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/algebraic/cl_C_abs.cc b/src/complex/algebraic/cl_C_abs.cc index 0e12551..0bad680 100644 --- a/src/complex/algebraic/cl_C_abs.cc +++ b/src/complex/algebraic/cl_C_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_inline.h" -#include "cl_C_abs_aux.cc" +#include "base/cl_inline.h" +#include "complex/algebraic/cl_C_abs_aux.cc" namespace cln { diff --git a/src/complex/algebraic/cl_C_abs_aux.cc b/src/complex/algebraic/cl_C_abs_aux.cc index 8ea3d6f..e1b53fd 100644 --- a/src/complex/algebraic/cl_C_abs_aux.cc +++ b/src/complex/algebraic/cl_C_abs_aux.cc @@ -1,10 +1,10 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. diff --git a/src/complex/algebraic/cl_C_signum.cc b/src/complex/algebraic/cl_C_signum.cc index 357d7db..4d69903 100644 --- a/src/complex/algebraic/cl_C_signum.cc +++ b/src/complex/algebraic/cl_C_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_inline.h" -#include "cl_C_abs_aux.cc" +#include "base/cl_inline.h" +#include "complex/algebraic/cl_C_abs_aux.cc" namespace cln { diff --git a/src/complex/algebraic/cl_C_sqrt.cc b/src/complex/algebraic/cl_C_sqrt.cc index 29abf4a..309b9a7 100644 --- a/src/complex/algebraic/cl_C_sqrt.cc +++ b/src/complex/algebraic/cl_C_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/algebraic/cl_DF_hypot.cc b/src/complex/algebraic/cl_DF_hypot.cc index 09f0db5..a88e5ab 100644 --- a/src/complex/algebraic/cl_DF_hypot.cc +++ b/src/complex/algebraic/cl_DF_hypot.cc @@ -1,20 +1,20 @@ // cl_hypot(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/dfloat.h" -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" /* For inline version of minusp */ -#include "cl_inline.h" -#include "cl_DF_minusp.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" namespace cln { diff --git a/src/complex/algebraic/cl_FF_hypot.cc b/src/complex/algebraic/cl_FF_hypot.cc index e66366c..0cf1aac 100644 --- a/src/complex/algebraic/cl_FF_hypot.cc +++ b/src/complex/algebraic/cl_FF_hypot.cc @@ -1,20 +1,20 @@ // cl_hypot(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/ffloat.h" -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" /* For inline version of minusp */ -#include "cl_inline.h" -#include "cl_FF_minusp.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" namespace cln { diff --git a/src/complex/algebraic/cl_LF_hypot.cc b/src/complex/algebraic/cl_LF_hypot.cc index 4959e11..21e4d2a 100644 --- a/src/complex/algebraic/cl_LF_hypot.cc +++ b/src/complex/algebraic/cl_LF_hypot.cc @@ -1,21 +1,21 @@ // cl_hypot(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" /* For inline version of minusp */ -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/complex/algebraic/cl_R_hypot.cc b/src/complex/algebraic/cl_R_hypot.cc index 78ebf8c..b43cf08 100644 --- a/src/complex/algebraic/cl_R_hypot.cc +++ b/src/complex/algebraic/cl_R_hypot.cc @@ -1,23 +1,23 @@ // cl_hypot(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "rational/cl_RA.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/complex/algebraic/cl_SF_hypot.cc b/src/complex/algebraic/cl_SF_hypot.cc index 88c3df7..f6f8969 100644 --- a/src/complex/algebraic/cl_SF_hypot.cc +++ b/src/complex/algebraic/cl_SF_hypot.cc @@ -1,20 +1,20 @@ // cl_hypot(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/sfloat.h" -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" /* For inline copy of minusp */ -#include "cl_inline.h" -#include "cl_SF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" namespace cln { diff --git a/src/complex/cl_C.h b/src/complex/cl_C.h index 23cbd01..11a3d06 100644 --- a/src/complex/cl_C.h +++ b/src/complex/cl_C.h @@ -9,7 +9,7 @@ #include "cln/ffloat_class.h" #include "cln/dfloat_class.h" #include "cln/lfloat_class.h" -#include "cl_macros.h" +#include "base/cl_macros.h" #include "cln/malloc.h" namespace cln { diff --git a/src/complex/elem/Makeflags b/src/complex/elem/Makeflags deleted file mode 100644 index 6530f93..0000000 --- a/src/complex/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real diff --git a/src/complex/elem/cl_C_equal.cc b/src/complex/elem/cl_C_equal.cc index 4263956..e2dcfdd 100644 --- a/src/complex/elem/cl_C_equal.cc +++ b/src/complex/elem/cl_C_equal.cc @@ -1,7 +1,7 @@ // equal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_from_R_R_complex.cc b/src/complex/elem/cl_C_from_R_R_complex.cc index eefeabb..2b248e7 100644 --- a/src/complex/elem/cl_C_from_R_R_complex.cc +++ b/src/complex/elem/cl_C_from_R_R_complex.cc @@ -1,10 +1,10 @@ // complex_C(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. diff --git a/src/complex/elem/cl_C_from_R_R_complex1.cc b/src/complex/elem/cl_C_from_R_R_complex1.cc index 9056e3c..c4ebe99 100644 --- a/src/complex/elem/cl_C_from_R_R_complex1.cc +++ b/src/complex/elem/cl_C_from_R_R_complex1.cc @@ -1,15 +1,15 @@ // complex(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/complex/elem/cl_C_imagpart.cc b/src/complex/elem/cl_C_imagpart.cc index 14215f8..3d65ece 100644 --- a/src/complex/elem/cl_C_imagpart.cc +++ b/src/complex/elem/cl_C_imagpart.cc @@ -1,7 +1,7 @@ // imagpart(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" namespace cln { diff --git a/src/complex/elem/cl_C_minus.cc b/src/complex/elem/cl_C_minus.cc index adf043b..b4abefe 100644 --- a/src/complex/elem/cl_C_minus.cc +++ b/src/complex/elem/cl_C_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_minus1.cc b/src/complex/elem/cl_C_minus1.cc index e6e335b..e6bda1f 100644 --- a/src/complex/elem/cl_C_minus1.cc +++ b/src/complex/elem/cl_C_minus1.cc @@ -1,7 +1,7 @@ // minus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_mul.cc b/src/complex/elem/cl_C_mul.cc index ef62a30..351d797 100644 --- a/src/complex/elem/cl_C_mul.cc +++ b/src/complex/elem/cl_C_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_plus.cc b/src/complex/elem/cl_C_plus.cc index c60638d..a19f0c6 100644 --- a/src/complex/elem/cl_C_plus.cc +++ b/src/complex/elem/cl_C_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_plus1.cc b/src/complex/elem/cl_C_plus1.cc index 3b28b9d..6a8c4a2 100644 --- a/src/complex/elem/cl_C_plus1.cc +++ b/src/complex/elem/cl_C_plus1.cc @@ -1,7 +1,7 @@ // plus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_realpart.cc b/src/complex/elem/cl_C_realpart.cc index 5a5c209..55ff019 100644 --- a/src/complex/elem/cl_C_realpart.cc +++ b/src/complex/elem/cl_C_realpart.cc @@ -1,7 +1,7 @@ // realpart(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" namespace cln { diff --git a/src/complex/elem/cl_C_square.cc b/src/complex/elem/cl_C_square.cc index ebae275..672c218 100644 --- a/src/complex/elem/cl_C_square.cc +++ b/src/complex/elem/cl_C_square.cc @@ -1,7 +1,7 @@ // square(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_uminus.cc b/src/complex/elem/cl_C_uminus.cc index d177b15..5174022 100644 --- a/src/complex/elem/cl_C_uminus.cc +++ b/src/complex/elem/cl_C_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/cl_C_zerop.cc b/src/complex/elem/cl_C_zerop.cc index b9344c8..7027030 100644 --- a/src/complex/elem/cl_C_zerop.cc +++ b/src/complex/elem/cl_C_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/division/Makeflags b/src/complex/elem/division/Makeflags deleted file mode 100644 index d9e31e6..0000000 --- a/src/complex/elem/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/elem/division/cl_C_DF_recip.cc b/src/complex/elem/division/cl_C_DF_recip.cc index ac22fb0..5088369 100644 --- a/src/complex/elem/division/cl_C_DF_recip.cc +++ b/src/complex/elem/division/cl_C_DF_recip.cc @@ -1,16 +1,16 @@ // cl_C_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/dfloat.h" -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/complex/elem/division/cl_C_FF_recip.cc b/src/complex/elem/division/cl_C_FF_recip.cc index ea9179a..e01c65a 100644 --- a/src/complex/elem/division/cl_C_FF_recip.cc +++ b/src/complex/elem/division/cl_C_FF_recip.cc @@ -1,16 +1,16 @@ // cl_C_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/ffloat.h" -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/complex/elem/division/cl_C_LF_recip.cc b/src/complex/elem/division/cl_C_LF_recip.cc index 9808185..ac90a5a 100644 --- a/src/complex/elem/division/cl_C_LF_recip.cc +++ b/src/complex/elem/division/cl_C_LF_recip.cc @@ -1,17 +1,17 @@ // cl_C_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/complex/elem/division/cl_C_SF_recip.cc b/src/complex/elem/division/cl_C_SF_recip.cc index ea00945..12f1eda 100644 --- a/src/complex/elem/division/cl_C_SF_recip.cc +++ b/src/complex/elem/division/cl_C_SF_recip.cc @@ -1,16 +1,16 @@ // cl_C_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/sfloat.h" -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/complex/elem/division/cl_C_div.cc b/src/complex/elem/division/cl_C_div.cc index 94eadbf..0646d08 100644 --- a/src/complex/elem/division/cl_C_div.cc +++ b/src/complex/elem/division/cl_C_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/elem/division/cl_C_recip.cc b/src/complex/elem/division/cl_C_recip.cc index 4c222fd..8a620d5 100644 --- a/src/complex/elem/division/cl_C_recip.cc +++ b/src/complex/elem/division/cl_C_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "rational/cl_RA.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/complex/input/Makeflags b/src/complex/input/Makeflags deleted file mode 100644 index 652253f..0000000 --- a/src/complex/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float -I$(srcdir)/integer -I$(srcdir)/base/string -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/input/cl_N_from_string.cc b/src/complex/input/cl_N_from_string.cc index 32fee76..be0c5d3 100644 --- a/src/complex/input/cl_N_from_string.cc +++ b/src/complex/input/cl_N_from_string.cc @@ -1,7 +1,7 @@ // cl_N (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex_class.h" diff --git a/src/complex/input/cl_N_read.cc b/src/complex/input/cl_N_read.cc index cc9a043..0b24e0b 100644 --- a/src/complex/input/cl_N_read.cc +++ b/src/complex/input/cl_N_read.cc @@ -1,7 +1,7 @@ // read_complex(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex_io.h" @@ -17,9 +17,9 @@ #include "cln/rational_io.h" #include "cln/integer_io.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" -#include "cl_C.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" +#include "complex/cl_C.h" #include "cln/exception.h" #undef floor diff --git a/src/complex/input/cl_N_read_stream.cc b/src/complex/input/cl_N_read_stream.cc index 330f068..fa1f594 100644 --- a/src/complex/input/cl_N_read_stream.cc +++ b/src/complex/input/cl_N_read_stream.cc @@ -1,7 +1,7 @@ // read_complex(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex_io.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" #include "cln/input.h" namespace cln { diff --git a/src/complex/misc/Makeflags b/src/complex/misc/Makeflags deleted file mode 100644 index 52a9d32..0000000 --- a/src/complex/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/misc/cl_C_class.cc b/src/complex/misc/cl_C_class.cc index ef5dfb6..35a5071 100644 --- a/src/complex/misc/cl_C_class.cc +++ b/src/complex/misc/cl_C_class.cc @@ -1,7 +1,7 @@ // cl_class_complex. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" namespace cln { diff --git a/src/complex/misc/cl_C_conjugate.cc b/src/complex/misc/cl_C_conjugate.cc index 1db942c..c18a9d9 100644 --- a/src/complex/misc/cl_C_conjugate.cc +++ b/src/complex/misc/cl_C_conjugate.cc @@ -1,7 +1,7 @@ // conjugate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/misc/cl_C_debug.cc b/src/complex/misc/cl_C_debug.cc index f4f1cbb..6cb8fe3 100644 --- a/src/complex/misc/cl_C_debug.cc +++ b/src/complex/misc/cl_C_debug.cc @@ -1,7 +1,7 @@ // cl_C debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/complex/misc/cl_C_eqhashcode.cc b/src/complex/misc/cl_C_eqhashcode.cc index 6b60d87..56f1270 100644 --- a/src/complex/misc/cl_C_eqhashcode.cc +++ b/src/complex/misc/cl_C_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_N equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_N.h" -#include "cl_C.h" +#include "base/cl_N.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/misc/cl_C_expt.cc b/src/complex/misc/cl_C_expt.cc index 160ad59..6636453 100644 --- a/src/complex/misc/cl_C_expt.cc +++ b/src/complex/misc/cl_C_expt.cc @@ -1,7 +1,7 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/misc/cl_C_expt_I.cc b/src/complex/misc/cl_C_expt_I.cc index 9e0bfd6..bc4eb11 100644 --- a/src/complex/misc/cl_C_expt_I.cc +++ b/src/complex/misc/cl_C_expt_I.cc @@ -1,7 +1,7 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/complex/misc/cl_N_as.cc b/src/complex/misc/cl_N_as.cc index 003b6c3..21d09ca 100644 --- a/src/complex/misc/cl_N_as.cc +++ b/src/complex/misc/cl_N_as.cc @@ -1,7 +1,7 @@ // cl_N_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" #include "cln/exception.h" namespace cln { diff --git a/src/complex/output/Makeflags b/src/complex/output/Makeflags deleted file mode 100644 index 56d7a89..0000000 --- a/src/complex/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += diff --git a/src/complex/output/cl_N_aprint.cc b/src/complex/output/cl_N_aprint.cc index bae3b35..227e794 100644 --- a/src/complex/output/cl_N_aprint.cc +++ b/src/complex/output/cl_N_aprint.cc @@ -1,7 +1,7 @@ // print_complex(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex_io.h" diff --git a/src/complex/output/cl_N_bprint.cc b/src/complex/output/cl_N_bprint.cc index d9c1371..8179f2f 100644 --- a/src/complex/output/cl_N_bprint.cc +++ b/src/complex/output/cl_N_bprint.cc @@ -1,7 +1,7 @@ // print_complex(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex_io.h" @@ -11,7 +11,7 @@ #include "cln/output.h" #include "cln/complex.h" -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real_io.h" namespace cln { diff --git a/src/complex/ring/Makeflags b/src/complex/ring/Makeflags deleted file mode 100644 index 56d7a89..0000000 --- a/src/complex/ring/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += diff --git a/src/complex/ring/cl_C_ring.cc b/src/complex/ring/cl_C_ring.cc index 32d6ccf..ab941c8 100644 --- a/src/complex/ring/cl_C_ring.cc +++ b/src/complex/ring/cl_C_ring.cc @@ -1,7 +1,7 @@ // Ring of complex numbers. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex_ring.h" @@ -11,7 +11,7 @@ #include "cln/complex.h" #include "cln/complex_io.h" -#include "cl_C.h" +#include "complex/cl_C.h" namespace cln { diff --git a/src/complex/transcendental/Makeflags b/src/complex/transcendental/Makeflags deleted file mode 100644 index cd21a8c..0000000 --- a/src/complex/transcendental/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real/conv -I$(srcdir)/real -I$(srcdir)/float/transcendental -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/transcendental/cl_C_acos.cc b/src/complex/transcendental/cl_C_acos.cc index 1004206..21b8a1d 100644 --- a/src/complex/transcendental/cl_C_acos.cc +++ b/src/complex/transcendental/cl_C_acos.cc @@ -1,7 +1,7 @@ // acos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/float.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_acosh.cc b/src/complex/transcendental/cl_C_acosh.cc index 32c204d..0efdac3 100644 --- a/src/complex/transcendental/cl_C_acosh.cc +++ b/src/complex/transcendental/cl_C_acosh.cc @@ -1,7 +1,7 @@ // acosh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/float.h" /* Use inline version of cl_float -- cl_float_inline */ -#include "cl_inline.h" -#include "cl_F_from_R_def.cc" +#include "base/cl_inline.h" +#include "real/conv/cl_F_from_R_def.cc" namespace cln { diff --git a/src/complex/transcendental/cl_C_asin.cc b/src/complex/transcendental/cl_C_asin.cc index 4698e3d..4843d23 100644 --- a/src/complex/transcendental/cl_C_asin.cc +++ b/src/complex/transcendental/cl_C_asin.cc @@ -1,7 +1,7 @@ // asin(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_asinh.cc b/src/complex/transcendental/cl_C_asinh.cc index a11100f..23d773a 100644 --- a/src/complex/transcendental/cl_C_asinh.cc +++ b/src/complex/transcendental/cl_C_asinh.cc @@ -1,7 +1,7 @@ // asinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_asinh_aux.cc b/src/complex/transcendental/cl_C_asinh_aux.cc index ffc43ef..a51ade9 100644 --- a/src/complex/transcendental/cl_C_asinh_aux.cc +++ b/src/complex/transcendental/cl_C_asinh_aux.cc @@ -1,24 +1,24 @@ // asinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. #include "cln/real.h" -#include "cl_F_tran.h" -#include "cl_R.h" +#include "float/transcendental/cl_F_tran.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/float.h" /* Use the inline version of cl_float */ -#include "cl_inline.h" -#include "cl_F_from_R_def.cc" +#include "base/cl_inline.h" +#include "real/conv/cl_F_from_R_def.cc" namespace cln { diff --git a/src/complex/transcendental/cl_C_atan.cc b/src/complex/transcendental/cl_C_atan.cc index 95ceadc..e03c59a 100644 --- a/src/complex/transcendental/cl_C_atan.cc +++ b/src/complex/transcendental/cl_C_atan.cc @@ -1,7 +1,7 @@ // atan(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_atanh.cc b/src/complex/transcendental/cl_C_atanh.cc index 5d7c2d1..4df5b4e 100644 --- a/src/complex/transcendental/cl_C_atanh.cc +++ b/src/complex/transcendental/cl_C_atanh.cc @@ -1,7 +1,7 @@ // atanh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_atanh_aux.cc b/src/complex/transcendental/cl_C_atanh_aux.cc index 92d58f0..a23b980 100644 --- a/src/complex/transcendental/cl_C_atanh_aux.cc +++ b/src/complex/transcendental/cl_C_atanh_aux.cc @@ -1,22 +1,22 @@ // atanh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_C.h" +#include "complex/cl_C.h" // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" #include "cln/real.h" -#include "cl_F_tran.h" -#include "cl_R.h" +#include "float/transcendental/cl_F_tran.h" +#include "real/cl_R.h" /* Use the inline version of cl_float */ -#include "cl_inline.h" -#include "cl_F_from_R_def.cc" +#include "base/cl_inline.h" +#include "real/conv/cl_F_from_R_def.cc" namespace cln { diff --git a/src/complex/transcendental/cl_C_cis.cc b/src/complex/transcendental/cl_C_cis.cc index fc29e43..11b9322 100644 --- a/src/complex/transcendental/cl_C_cis.cc +++ b/src/complex/transcendental/cl_C_cis.cc @@ -1,7 +1,7 @@ // cis(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_cos.cc b/src/complex/transcendental/cl_C_cos.cc index 3ef3ac9..415f582 100644 --- a/src/complex/transcendental/cl_C_cos.cc +++ b/src/complex/transcendental/cl_C_cos.cc @@ -1,7 +1,7 @@ // cos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_cosh.cc b/src/complex/transcendental/cl_C_cosh.cc index f3e44a1..39bebe0 100644 --- a/src/complex/transcendental/cl_C_cosh.cc +++ b/src/complex/transcendental/cl_C_cosh.cc @@ -1,7 +1,7 @@ // cosh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_exp.cc b/src/complex/transcendental/cl_C_exp.cc index 3a339de..e681556 100644 --- a/src/complex/transcendental/cl_C_exp.cc +++ b/src/complex/transcendental/cl_C_exp.cc @@ -1,7 +1,7 @@ // exp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_expt_C.cc b/src/complex/transcendental/cl_C_expt_C.cc index a09f5e1..f4b8d27 100644 --- a/src/complex/transcendental/cl_C_expt_C.cc +++ b/src/complex/transcendental/cl_C_expt_C.cc @@ -1,20 +1,20 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" -#include "cl_I.h" -#include "cl_N.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_log.cc b/src/complex/transcendental/cl_C_log.cc index c96577c..20f834d 100644 --- a/src/complex/transcendental/cl_C_log.cc +++ b/src/complex/transcendental/cl_C_log.cc @@ -1,7 +1,7 @@ // log(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_log2.cc b/src/complex/transcendental/cl_C_log2.cc index f474011..6f8bdfa 100644 --- a/src/complex/transcendental/cl_C_log2.cc +++ b/src/complex/transcendental/cl_C_log2.cc @@ -1,7 +1,7 @@ // log(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" -#include "cl_R.h" -#include "cl_N.h" +#include "real/cl_R.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_phase.cc b/src/complex/transcendental/cl_C_phase.cc index cce43cb..ba4d37f 100644 --- a/src/complex/transcendental/cl_C_phase.cc +++ b/src/complex/transcendental/cl_C_phase.cc @@ -1,7 +1,7 @@ // phase(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_sin.cc b/src/complex/transcendental/cl_C_sin.cc index ed08354..045abec 100644 --- a/src/complex/transcendental/cl_C_sin.cc +++ b/src/complex/transcendental/cl_C_sin.cc @@ -1,7 +1,7 @@ // sin(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_sinh.cc b/src/complex/transcendental/cl_C_sinh.cc index 7b426c4..427124d 100644 --- a/src/complex/transcendental/cl_C_sinh.cc +++ b/src/complex/transcendental/cl_C_sinh.cc @@ -1,7 +1,7 @@ // sinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_tan.cc b/src/complex/transcendental/cl_C_tan.cc index 52aff85..64db64c 100644 --- a/src/complex/transcendental/cl_C_tan.cc +++ b/src/complex/transcendental/cl_C_tan.cc @@ -1,7 +1,7 @@ // tan(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_C_tanh.cc b/src/complex/transcendental/cl_C_tanh.cc index 331a066..0716aeb 100644 --- a/src/complex/transcendental/cl_C_tanh.cc +++ b/src/complex/transcendental/cl_C_tanh.cc @@ -1,7 +1,7 @@ // tanh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/complex/transcendental/cl_R_cis.cc b/src/complex/transcendental/cl_R_cis.cc index 63c62e6..6495b01 100644 --- a/src/complex/transcendental/cl_R_cis.cc +++ b/src/complex/transcendental/cl_R_cis.cc @@ -1,7 +1,7 @@ // cis(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/complex.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_C.h" +#include "complex/cl_C.h" #include "cln/real.h" namespace cln { diff --git a/src/float/Makeflags b/src/float/Makeflags deleted file mode 100644 index 2b2c3e0..0000000 --- a/src/float/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/float/algebraic/Makeflags b/src/float/algebraic/Makeflags deleted file mode 100644 index 546ddeb..0000000 --- a/src/float/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/algebraic/cl_F_sqrt.cc b/src/float/algebraic/cl_F_sqrt.cc index 6267c8d..7a9307c 100644 --- a/src/float/algebraic/cl_F_sqrt.cc +++ b/src/float/algebraic/cl_F_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/base/Makeflags b/src/float/base/Makeflags deleted file mode 100644 index f1679ce..0000000 --- a/src/float/base/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -Ifloat diff --git a/src/float/base/cl_F_globals.cc b/src/float/base/cl_F_globals.cc index a7c5678..7c79fa6 100644 --- a/src/float/base/cl_F_globals.cc +++ b/src/float/base/cl_F_globals.cc @@ -1,7 +1,7 @@ // Global variables in CLN // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" diff --git a/src/float/base/cl_F_nan_exception.cc b/src/float/base/cl_F_nan_exception.cc index a1a70d3..a080f31 100644 --- a/src/float/base/cl_F_nan_exception.cc +++ b/src/float/base/cl_F_nan_exception.cc @@ -1,10 +1,10 @@ // floating_point_nan_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. diff --git a/src/float/base/cl_F_overflow_exception.cc b/src/float/base/cl_F_overflow_exception.cc index f35d7b7..fe19280 100644 --- a/src/float/base/cl_F_overflow_exception.cc +++ b/src/float/base/cl_F_overflow_exception.cc @@ -1,10 +1,10 @@ // floating_point_overflow_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. diff --git a/src/float/base/cl_F_underflow_exception.cc b/src/float/base/cl_F_underflow_exception.cc index ab717ae..6b1971f 100644 --- a/src/float/base/cl_F_underflow_exception.cc +++ b/src/float/base/cl_F_underflow_exception.cc @@ -1,10 +1,10 @@ // floating_point_underflow_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. diff --git a/src/float/cl_F.h b/src/float/cl_F.h index 5a74c98..a7d63fa 100644 --- a/src/float/cl_F.h +++ b/src/float/cl_F.h @@ -4,7 +4,7 @@ #define _CL_F_H #include "cln/number.h" -#include "cl_macros.h" +#include "base/cl_macros.h" #include "cln/float.h" namespace cln { diff --git a/src/float/conv/Makeflags b/src/float/conv/Makeflags deleted file mode 100644 index 546ddeb..0000000 --- a/src/float/conv/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/conv/cl_DF_to_FF.cc b/src/float/conv/cl_DF_to_FF.cc index 18abcde..f857ecc 100644 --- a/src/float/conv/cl_DF_to_FF.cc +++ b/src/float/conv/cl_DF_to_FF.cc @@ -1,16 +1,16 @@ // cl_DF_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_DF.h" -#include "cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/conv/cl_DF_to_LF.cc b/src/float/conv/cl_DF_to_LF.cc index 260d005..5c367c8 100644 --- a/src/float/conv/cl_DF_to_LF.cc +++ b/src/float/conv/cl_DF_to_LF.cc @@ -1,18 +1,18 @@ // cl_DF_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_DF_to_SF.cc b/src/float/conv/cl_DF_to_SF.cc index 3637c7c..285b3d9 100644 --- a/src/float/conv/cl_DF_to_SF.cc +++ b/src/float/conv/cl_DF_to_SF.cc @@ -1,16 +1,16 @@ // cl_DF_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_DF.h" -#include "cl_SF.h" +#include "float/dfloat/cl_DF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/conv/cl_DF_to_double.cc b/src/float/conv/cl_DF_to_double.cc index 94645d2..c4324cf 100644 --- a/src/float/conv/cl_DF_to_double.cc +++ b/src/float/conv/cl_DF_to_double.cc @@ -1,7 +1,7 @@ // cl_DF_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/conv/cl_DF_to_float.cc b/src/float/conv/cl_DF_to_float.cc index c4f64d3..ff1076c 100644 --- a/src/float/conv/cl_DF_to_float.cc +++ b/src/float/conv/cl_DF_to_float.cc @@ -1,7 +1,7 @@ // cl_DF_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_DF.h" -#include "cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/conv/cl_FF_to_DF.cc b/src/float/conv/cl_FF_to_DF.cc index 71aa586..838f8ac 100644 --- a/src/float/conv/cl_FF_to_DF.cc +++ b/src/float/conv/cl_FF_to_DF.cc @@ -1,16 +1,16 @@ // cl_FF_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_FF.h" -#include "cl_DF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/conv/cl_FF_to_LF.cc b/src/float/conv/cl_FF_to_LF.cc index 1462519..174f149 100644 --- a/src/float/conv/cl_FF_to_LF.cc +++ b/src/float/conv/cl_FF_to_LF.cc @@ -1,18 +1,18 @@ // cl_FF_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_FF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/ffloat/cl_FF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_FF_to_SF.cc b/src/float/conv/cl_FF_to_SF.cc index d9b36e2..bcabc56 100644 --- a/src/float/conv/cl_FF_to_SF.cc +++ b/src/float/conv/cl_FF_to_SF.cc @@ -1,16 +1,16 @@ // cl_FF_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_FF.h" -#include "cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/conv/cl_FF_to_double.cc b/src/float/conv/cl_FF_to_double.cc index 14476b6..1db2805 100644 --- a/src/float/conv/cl_FF_to_double.cc +++ b/src/float/conv/cl_FF_to_double.cc @@ -1,7 +1,7 @@ // cl_FF_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_FF.h" -#include "cl_DF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/conv/cl_FF_to_float.cc b/src/float/conv/cl_FF_to_float.cc index a044aae..a5192fd 100644 --- a/src/float/conv/cl_FF_to_float.cc +++ b/src/float/conv/cl_FF_to_float.cc @@ -1,7 +1,7 @@ // cl_FF_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_F.cc b/src/float/conv/cl_F_from_F.cc index 1a76902..1e7608d 100644 --- a/src/float/conv/cl_F_from_F.cc +++ b/src/float/conv/cl_F_from_F.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_F_f.cc b/src/float/conv/cl_F_from_F_f.cc index fc1d0be..39bd881 100644 --- a/src/float/conv/cl_F_from_F_f.cc +++ b/src/float/conv/cl_F_from_F_f.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/conv/cl_F_from_I.cc b/src/float/conv/cl_F_from_I.cc index 7eee526..c3d8143 100644 --- a/src/float/conv/cl_F_from_I.cc +++ b/src/float/conv/cl_F_from_I.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_I_def.cc b/src/float/conv/cl_F_from_I_def.cc index 8b8e00d..65d4a45 100644 --- a/src/float/conv/cl_F_from_I_def.cc +++ b/src/float/conv/cl_F_from_I_def.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_I_f.cc b/src/float/conv/cl_F_from_I_f.cc index 1b5b8da..b6fbdc8 100644 --- a/src/float/conv/cl_F_from_I_f.cc +++ b/src/float/conv/cl_F_from_I_f.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_RA.cc b/src/float/conv/cl_F_from_RA.cc index 075ffc8..872c631 100644 --- a/src/float/conv/cl_F_from_RA.cc +++ b/src/float/conv/cl_F_from_RA.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_RA_def.cc b/src/float/conv/cl_F_from_RA_def.cc index 690ec5d..c8c8129 100644 --- a/src/float/conv/cl_F_from_RA_def.cc +++ b/src/float/conv/cl_F_from_RA_def.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_from_RA_f.cc b/src/float/conv/cl_F_from_RA_f.cc index 213db2a..42a21ba 100644 --- a/src/float/conv/cl_F_from_RA_f.cc +++ b/src/float/conv/cl_F_from_RA_f.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_to_DF.cc b/src/float/conv/cl_F_to_DF.cc index cbdc8f8..70876f6 100644 --- a/src/float/conv/cl_F_to_DF.cc +++ b/src/float/conv/cl_F_to_DF.cc @@ -1,7 +1,7 @@ // cl_F_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/conv/cl_F_to_FF.cc b/src/float/conv/cl_F_to_FF.cc index 0b0c710..1baf649 100644 --- a/src/float/conv/cl_F_to_FF.cc +++ b/src/float/conv/cl_F_to_FF.cc @@ -1,7 +1,7 @@ // cl_F_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/conv/cl_F_to_LF.cc b/src/float/conv/cl_F_to_LF.cc index 47ce39d..f19c03c 100644 --- a/src/float/conv/cl_F_to_LF.cc +++ b/src/float/conv/cl_F_to_LF.cc @@ -1,7 +1,7 @@ // cl_F_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/conv/cl_F_to_SF.cc b/src/float/conv/cl_F_to_SF.cc index 54ae87c..e72f5e4 100644 --- a/src/float/conv/cl_F_to_SF.cc +++ b/src/float/conv/cl_F_to_SF.cc @@ -1,7 +1,7 @@ // cl_F_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/conv/cl_F_to_double.cc b/src/float/conv/cl_F_to_double.cc index 54e6f74..61d0c05 100644 --- a/src/float/conv/cl_F_to_double.cc +++ b/src/float/conv/cl_F_to_double.cc @@ -1,7 +1,7 @@ // cl_F_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/conv/cl_F_to_float.cc b/src/float/conv/cl_F_to_float.cc index 51ee764..2b8736a 100644 --- a/src/float/conv/cl_F_to_float.cc +++ b/src/float/conv/cl_F_to_float.cc @@ -1,7 +1,7 @@ // cl_F_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/conv/cl_LF_to_DF.cc b/src/float/conv/cl_LF_to_DF.cc index 2ee8b68..9b8dc59 100644 --- a/src/float/conv/cl_LF_to_DF.cc +++ b/src/float/conv/cl_LF_to_DF.cc @@ -1,18 +1,18 @@ // cl_LF_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DF.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/dfloat/cl_DF.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_LF_to_FF.cc b/src/float/conv/cl_LF_to_FF.cc index 662042a..fd4b673 100644 --- a/src/float/conv/cl_LF_to_FF.cc +++ b/src/float/conv/cl_LF_to_FF.cc @@ -1,18 +1,18 @@ // cl_LF_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_FF.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/ffloat/cl_FF.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_LF_to_SF.cc b/src/float/conv/cl_LF_to_SF.cc index 843a52d..0649ebc 100644 --- a/src/float/conv/cl_LF_to_SF.cc +++ b/src/float/conv/cl_LF_to_SF.cc @@ -1,18 +1,18 @@ // cl_LF_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_SF.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/sfloat/cl_SF.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_LF_to_double.cc b/src/float/conv/cl_LF_to_double.cc index 5231944..078bd1b 100644 --- a/src/float/conv/cl_LF_to_double.cc +++ b/src/float/conv/cl_LF_to_double.cc @@ -1,7 +1,7 @@ // cl_LF_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DF.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/dfloat/cl_DF.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_LF_to_float.cc b/src/float/conv/cl_LF_to_float.cc index 1cad328..913b08e 100644 --- a/src/float/conv/cl_LF_to_float.cc +++ b/src/float/conv/cl_LF_to_float.cc @@ -1,7 +1,7 @@ // cl_LF_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_FF.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/ffloat/cl_FF.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_SF_to_DF.cc b/src/float/conv/cl_SF_to_DF.cc index a91c202..f931034 100644 --- a/src/float/conv/cl_SF_to_DF.cc +++ b/src/float/conv/cl_SF_to_DF.cc @@ -1,16 +1,16 @@ // cl_SF_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_SF.h" -#include "cl_DF.h" +#include "float/sfloat/cl_SF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/conv/cl_SF_to_FF.cc b/src/float/conv/cl_SF_to_FF.cc index a1771e4..212b5be 100644 --- a/src/float/conv/cl_SF_to_FF.cc +++ b/src/float/conv/cl_SF_to_FF.cc @@ -1,16 +1,16 @@ // cl_SF_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_SF.h" -#include "cl_FF.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/conv/cl_SF_to_LF.cc b/src/float/conv/cl_SF_to_LF.cc index 50fe938..c8e137d 100644 --- a/src/float/conv/cl_SF_to_LF.cc +++ b/src/float/conv/cl_SF_to_LF.cc @@ -1,18 +1,18 @@ // cl_SF_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_SF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/sfloat/cl_SF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/conv/cl_SF_to_double.cc b/src/float/conv/cl_SF_to_double.cc index 7c0f98c..b5863ce 100644 --- a/src/float/conv/cl_SF_to_double.cc +++ b/src/float/conv/cl_SF_to_double.cc @@ -1,7 +1,7 @@ // cl_SF_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_DF.h" +#include "float/sfloat/cl_SF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/conv/cl_SF_to_float.cc b/src/float/conv/cl_SF_to_float.cc index 8d592b9..46087a6 100644 --- a/src/float/conv/cl_SF_to_float.cc +++ b/src/float/conv/cl_SF_to_float.cc @@ -1,7 +1,7 @@ // cl_SF_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_FF.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/dfloat/Makeflags b/src/float/dfloat/Makeflags deleted file mode 100644 index ec29e37..0000000 --- a/src/float/dfloat/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/float/dfloat -I$(srcdir)/float -I$(srcdir)/base diff --git a/src/float/dfloat/algebraic/Makeflags b/src/float/dfloat/algebraic/Makeflags deleted file mode 100644 index a04b8bd..0000000 --- a/src/float/dfloat/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/algebraic/cl_DF_sqrt.cc b/src/float/dfloat/algebraic/cl_DF_sqrt.cc index ff9688e..4f61a63 100644 --- a/src/float/dfloat/algebraic/cl_DF_sqrt.cc +++ b/src/float/dfloat/algebraic/cl_DF_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_DF.h" -#include "cl_F.h" -#include "cl_low.h" -#include "cl_DS.h" +#include "float/dfloat/cl_DF.h" +#include "float/cl_F.h" +#include "base/cl_low.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/dfloat/cl_DF.h b/src/float/dfloat/cl_DF.h index d61fd5a..381c6c7 100644 --- a/src/float/dfloat/cl_DF.h +++ b/src/float/dfloat/cl_DF.h @@ -5,12 +5,12 @@ #include "cln/number.h" #include "cln/malloc.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #ifdef FAST_DOUBLE -#include "cl_N.h" -#include "cl_F.h" +#include "base/cl_N.h" +#include "float/cl_F.h" #endif namespace cln { diff --git a/src/float/dfloat/conv/Makeflags b/src/float/dfloat/conv/Makeflags deleted file mode 100644 index d52a363..0000000 --- a/src/float/dfloat/conv/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/conv/cl_DF_from_double.cc b/src/float/dfloat/conv/cl_DF_from_double.cc index 07537de..aa0df53 100644 --- a/src/float/dfloat/conv/cl_DF_from_double.cc +++ b/src/float/dfloat/conv/cl_DF_from_double.cc @@ -1,10 +1,10 @@ // cl_double_to_DF_pointer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. diff --git a/src/float/dfloat/conv/cl_DF_to_doublej.cc b/src/float/dfloat/conv/cl_DF_to_doublej.cc index a8a571a..c0296fb 100644 --- a/src/float/dfloat/conv/cl_DF_to_doublej.cc +++ b/src/float/dfloat/conv/cl_DF_to_doublej.cc @@ -1,10 +1,10 @@ // cl_DF_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. diff --git a/src/float/dfloat/conv/cl_I_to_double.cc b/src/float/dfloat/conv/cl_I_to_double.cc index 94cb5a5..b920ee4 100644 --- a/src/float/dfloat/conv/cl_I_to_double.cc +++ b/src/float/dfloat/conv/cl_I_to_double.cc @@ -1,7 +1,7 @@ // double_approx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_DF.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "float/dfloat/cl_DF.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/dfloat/conv/cl_RA_to_double.cc b/src/float/dfloat/conv/cl_RA_to_double.cc index eb29114..dac7ff0 100644 --- a/src/float/dfloat/conv/cl_RA_to_double.cc +++ b/src/float/dfloat/conv/cl_RA_to_double.cc @@ -1,7 +1,7 @@ // double_approx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_DF.h" -#include "cl_RA.h" +#include "float/dfloat/cl_DF.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/dfloat/division/Makeflags b/src/float/dfloat/division/Makeflags deleted file mode 100644 index 40164ab..0000000 --- a/src/float/dfloat/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/dfloat/elem diff --git a/src/float/dfloat/division/cl_DF_ceil22.cc b/src/float/dfloat/division/cl_DF_ceil22.cc index 4165c7a..1bff51f 100644 --- a/src/float/dfloat/division/cl_DF_ceil22.cc +++ b/src/float/dfloat/division/cl_DF_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/division/cl_DF_fceil.cc b/src/float/dfloat/division/cl_DF_fceil.cc index 3e6116d..636f50c 100644 --- a/src/float/dfloat/division/cl_DF_fceil.cc +++ b/src/float/dfloat/division/cl_DF_fceil.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" /* For inline version of minusp */ -#include "cl_inline.h" -#include "cl_DF_minusp.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" namespace cln { diff --git a/src/float/dfloat/division/cl_DF_floor22.cc b/src/float/dfloat/division/cl_DF_floor22.cc index 98022ee..07331a9 100644 --- a/src/float/dfloat/division/cl_DF_floor22.cc +++ b/src/float/dfloat/division/cl_DF_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/division/cl_DF_recip.cc b/src/float/dfloat/division/cl_DF_recip.cc index 2bf62e8..21747a2 100644 --- a/src/float/dfloat/division/cl_DF_recip.cc +++ b/src/float/dfloat/division/cl_DF_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/division/cl_DF_round22.cc b/src/float/dfloat/division/cl_DF_round22.cc index 5c34713..9930317 100644 --- a/src/float/dfloat/division/cl_DF_round22.cc +++ b/src/float/dfloat/division/cl_DF_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/division/cl_DF_trunc22.cc b/src/float/dfloat/division/cl_DF_trunc22.cc index e6d1f80..4690354 100644 --- a/src/float/dfloat/division/cl_DF_trunc22.cc +++ b/src/float/dfloat/division/cl_DF_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/Makeflags b/src/float/dfloat/elem/Makeflags deleted file mode 100644 index 171ae81..0000000 --- a/src/float/dfloat/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/base -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/elem/cl_DF_compare.cc b/src/float/dfloat/elem/cl_DF_compare.cc index 9dc784a..9feb208 100644 --- a/src/float/dfloat/elem/cl_DF_compare.cc +++ b/src/float/dfloat/elem/cl_DF_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_div.cc b/src/float/dfloat/elem/cl_DF_div.cc index d2d8ada..878f8f8 100644 --- a/src/float/dfloat/elem/cl_DF_div.cc +++ b/src/float/dfloat/elem/cl_DF_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_DF.h" -#include "cl_N.h" -#include "cl_F.h" -#include "cl_low.h" -#include "cl_DS.h" +#include "float/dfloat/cl_DF.h" +#include "base/cl_N.h" +#include "float/cl_F.h" +#include "base/cl_low.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_DF_zerop.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_zerop.cc" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_ffloor.cc b/src/float/dfloat/elem/cl_DF_ffloor.cc index 6dc3c08..8eb8270 100644 --- a/src/float/dfloat/elem/cl_DF_ffloor.cc +++ b/src/float/dfloat/elem/cl_DF_ffloor.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" -#include "cl_inline.h" -#include "cl_DF_minusp.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_from_I.cc b/src/float/dfloat/elem/cl_DF_from_I.cc index 9a14b3e..2a03eb3 100644 --- a/src/float/dfloat/elem/cl_DF_from_I.cc +++ b/src/float/dfloat/elem/cl_DF_from_I.cc @@ -1,18 +1,18 @@ // cl_I_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_from_RA.cc b/src/float/dfloat/elem/cl_DF_from_RA.cc index efc66cf..6eb91f3 100644 --- a/src/float/dfloat/elem/cl_DF_from_RA.cc +++ b/src/float/dfloat/elem/cl_DF_from_RA.cc @@ -1,18 +1,18 @@ // cl_RA_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_fround.cc b/src/float/dfloat/elem/cl_DF_fround.cc index 4efdb8f..683871e 100644 --- a/src/float/dfloat/elem/cl_DF_fround.cc +++ b/src/float/dfloat/elem/cl_DF_fround.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_ftrunc.cc b/src/float/dfloat/elem/cl_DF_ftrunc.cc index fa5e126..8e517a2 100644 --- a/src/float/dfloat/elem/cl_DF_ftrunc.cc +++ b/src/float/dfloat/elem/cl_DF_ftrunc.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_futrunc.cc b/src/float/dfloat/elem/cl_DF_futrunc.cc index 6a7a227..b5825a5 100644 --- a/src/float/dfloat/elem/cl_DF_futrunc.cc +++ b/src/float/dfloat/elem/cl_DF_futrunc.cc @@ -1,10 +1,10 @@ // futruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. diff --git a/src/float/dfloat/elem/cl_DF_globals.cc b/src/float/dfloat/elem/cl_DF_globals.cc index b959c76..4009d49 100644 --- a/src/float/dfloat/elem/cl_DF_globals.cc +++ b/src/float/dfloat/elem/cl_DF_globals.cc @@ -1,10 +1,10 @@ // Global variables for cl_DF. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. diff --git a/src/float/dfloat/elem/cl_DF_minus.cc b/src/float/dfloat/elem/cl_DF_minus.cc index 1e5447f..44d2747 100644 --- a/src/float/dfloat/elem/cl_DF_minus.cc +++ b/src/float/dfloat/elem/cl_DF_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_minusp.cc b/src/float/dfloat/elem/cl_DF_minusp.cc index 0eff54e..cd316f8 100644 --- a/src/float/dfloat/elem/cl_DF_minusp.cc +++ b/src/float/dfloat/elem/cl_DF_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_mul.cc b/src/float/dfloat/elem/cl_DF_mul.cc index 050d2c5..59b3c07 100644 --- a/src/float/dfloat/elem/cl_DF_mul.cc +++ b/src/float/dfloat/elem/cl_DF_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_DF.h" -#include "cl_F.h" -#include "cl_low.h" -#include "cl_DS.h" +#include "float/dfloat/cl_DF.h" +#include "float/cl_F.h" +#include "base/cl_low.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_DF_zerop.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_zerop.cc" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_plus.cc b/src/float/dfloat/elem/cl_DF_plus.cc index 4b94b48..63077e8 100644 --- a/src/float/dfloat/elem/cl_DF_plus.cc +++ b/src/float/dfloat/elem/cl_DF_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_DF.h" -#include "cl_F.h" -#include "cl_xmacros.h" +#include "float/dfloat/cl_DF.h" +#include "float/cl_F.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_plusp.cc b/src/float/dfloat/elem/cl_DF_plusp.cc index aab9369..330533c 100644 --- a/src/float/dfloat/elem/cl_DF_plusp.cc +++ b/src/float/dfloat/elem/cl_DF_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" -#include "cl_inline.h" -#include "cl_DF_minusp.cc" -#include "cl_DF_zerop.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" +#include "float/dfloat/elem/cl_DF_zerop.cc" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_scale.cc b/src/float/dfloat/elem/cl_DF_scale.cc index 138d0c6..e72ded3 100644 --- a/src/float/dfloat/elem/cl_DF_scale.cc +++ b/src/float/dfloat/elem/cl_DF_scale.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_DF.h" -#include "cl_F.h" +#include "float/dfloat/cl_DF.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_scale_I.cc b/src/float/dfloat/elem/cl_DF_scale_I.cc index 00e26a8..c221fd7 100644 --- a/src/float/dfloat/elem/cl_DF_scale_I.cc +++ b/src/float/dfloat/elem/cl_DF_scale_I.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_DF.h" -#include "cl_F.h" -#include "cl_I.h" +#include "float/dfloat/cl_DF.h" +#include "float/cl_F.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_to_I.cc b/src/float/dfloat/elem/cl_DF_to_I.cc index 94ba5b6..3996808 100644 --- a/src/float/dfloat/elem/cl_DF_to_I.cc +++ b/src/float/dfloat/elem/cl_DF_to_I.cc @@ -1,16 +1,16 @@ // cl_DF_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_uminus.cc b/src/float/dfloat/elem/cl_DF_uminus.cc index d2e970a..f85f2a1 100644 --- a/src/float/dfloat/elem/cl_DF_uminus.cc +++ b/src/float/dfloat/elem/cl_DF_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/elem/cl_DF_zerop.cc b/src/float/dfloat/elem/cl_DF_zerop.cc index 8af6b73..2ddf975 100644 --- a/src/float/dfloat/elem/cl_DF_zerop.cc +++ b/src/float/dfloat/elem/cl_DF_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/input/Makeflags b/src/float/dfloat/input/Makeflags deleted file mode 100644 index 2b0712c..0000000 --- a/src/float/dfloat/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/dfloat/input/cl_DF_from_string.cc b/src/float/dfloat/input/cl_DF_from_string.cc index c1069d2..f6b8da9 100644 --- a/src/float/dfloat/input/cl_DF_from_string.cc +++ b/src/float/dfloat/input/cl_DF_from_string.cc @@ -1,7 +1,7 @@ // cl_DF (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat_class.h" diff --git a/src/float/dfloat/misc/Makeflags b/src/float/dfloat/misc/Makeflags deleted file mode 100644 index aa6cd70..0000000 --- a/src/float/dfloat/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/dfloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/misc/cl_DF_abs.cc b/src/float/dfloat/misc/cl_DF_abs.cc index 8a2f725..9f06a66 100644 --- a/src/float/dfloat/misc/cl_DF_abs.cc +++ b/src/float/dfloat/misc/cl_DF_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_inline.h" -#include "cl_DF_minusp.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_as.cc b/src/float/dfloat/misc/cl_DF_as.cc index ac091e9..bad23fb 100644 --- a/src/float/dfloat/misc/cl_DF_as.cc +++ b/src/float/dfloat/misc/cl_DF_as.cc @@ -1,7 +1,7 @@ // cl_DF_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_class.cc b/src/float/dfloat/misc/cl_DF_class.cc index ec0f66e..365c52c 100644 --- a/src/float/dfloat/misc/cl_DF_class.cc +++ b/src/float/dfloat/misc/cl_DF_class.cc @@ -1,7 +1,7 @@ // cl_class_dfloat. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" diff --git a/src/float/dfloat/misc/cl_DF_debug.cc b/src/float/dfloat/misc/cl_DF_debug.cc index 0232915..33005d6 100644 --- a/src/float/dfloat/misc/cl_DF_debug.cc +++ b/src/float/dfloat/misc/cl_DF_debug.cc @@ -1,7 +1,7 @@ // cl_DF debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/float/dfloat/misc/cl_DF_decode.cc b/src/float/dfloat/misc/cl_DF_decode.cc index e082f77..b4d5fe2 100644 --- a/src/float/dfloat/misc/cl_DF_decode.cc +++ b/src/float/dfloat/misc/cl_DF_decode.cc @@ -1,7 +1,7 @@ // decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_DF.h" -#include "cl_I.h" +#include "float/dfloat/cl_DF.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_digits.cc b/src/float/dfloat/misc/cl_DF_digits.cc index a8457f3..9b9f555 100644 --- a/src/float/dfloat/misc/cl_DF_digits.cc +++ b/src/float/dfloat/misc/cl_DF_digits.cc @@ -1,7 +1,7 @@ // float_digits(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_eqhashcode.cc b/src/float/dfloat/misc/cl_DF_eqhashcode.cc index cef05b9..e0e2ace 100644 --- a/src/float/dfloat/misc/cl_DF_eqhashcode.cc +++ b/src/float/dfloat/misc/cl_DF_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_DF equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_N.h" -#include "cl_DF.h" +#include "base/cl_N.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_exponent.cc b/src/float/dfloat/misc/cl_DF_exponent.cc index 677bd19..a02e866 100644 --- a/src/float/dfloat/misc/cl_DF_exponent.cc +++ b/src/float/dfloat/misc/cl_DF_exponent.cc @@ -1,7 +1,7 @@ // float_exponent(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_idecode.cc b/src/float/dfloat/misc/cl_DF_idecode.cc index 44b6b21..b28d0dd 100644 --- a/src/float/dfloat/misc/cl_DF_idecode.cc +++ b/src/float/dfloat/misc/cl_DF_idecode.cc @@ -1,7 +1,7 @@ // integer_decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_DF.h" -#include "cl_I.h" +#include "float/dfloat/cl_DF.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_max.cc b/src/float/dfloat/misc/cl_DF_max.cc index 4bebf26..427ebec 100644 --- a/src/float/dfloat/misc/cl_DF_max.cc +++ b/src/float/dfloat/misc/cl_DF_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" diff --git a/src/float/dfloat/misc/cl_DF_min.cc b/src/float/dfloat/misc/cl_DF_min.cc index c1a903c..22e3ff2 100644 --- a/src/float/dfloat/misc/cl_DF_min.cc +++ b/src/float/dfloat/misc/cl_DF_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" diff --git a/src/float/dfloat/misc/cl_DF_precision.cc b/src/float/dfloat/misc/cl_DF_precision.cc index 46178a8..05bfb81 100644 --- a/src/float/dfloat/misc/cl_DF_precision.cc +++ b/src/float/dfloat/misc/cl_DF_precision.cc @@ -1,7 +1,7 @@ // float_precision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" -#include "cl_inline.h" -#include "cl_DF_zerop.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_zerop.cc" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_sign.cc b/src/float/dfloat/misc/cl_DF_sign.cc index 5e2a13d..c9d22c7 100644 --- a/src/float/dfloat/misc/cl_DF_sign.cc +++ b/src/float/dfloat/misc/cl_DF_sign.cc @@ -1,7 +1,7 @@ // float_sign(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" -#include "cl_inline.h" -#include "cl_DF_minusp.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" namespace cln { diff --git a/src/float/dfloat/misc/cl_DF_signum.cc b/src/float/dfloat/misc/cl_DF_signum.cc index 1850ccb..b9162f1 100644 --- a/src/float/dfloat/misc/cl_DF_signum.cc +++ b/src/float/dfloat/misc/cl_DF_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/dfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" -#include "cl_inline.h" -#include "cl_DF_minusp.cc" -#include "cl_DF_zerop.cc" +#include "base/cl_inline.h" +#include "float/dfloat/elem/cl_DF_minusp.cc" +#include "float/dfloat/elem/cl_DF_zerop.cc" namespace cln { diff --git a/src/float/division/Makeflags b/src/float/division/Makeflags deleted file mode 100644 index 546ddeb..0000000 --- a/src/float/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/division/cl_F_ceil1.cc b/src/float/division/cl_F_ceil1.cc index b9f5dee..688bef3 100644 --- a/src/float/division/cl_F_ceil1.cc +++ b/src/float/division/cl_F_ceil1.cc @@ -1,7 +1,7 @@ // ceiling1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_ceil2.cc b/src/float/division/cl_F_ceil2.cc index 283c2af..e1efd35 100644 --- a/src/float/division/cl_F_ceil2.cc +++ b/src/float/division/cl_F_ceil2.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,15 +9,15 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_ceil22.cc b/src/float/division/cl_F_ceil22.cc index e0e5850..58d3d5a 100644 --- a/src/float/division/cl_F_ceil22.cc +++ b/src/float/division/cl_F_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/division/cl_F_fceil1.cc b/src/float/division/cl_F_fceil1.cc index a4a1bbd..0e88951 100644 --- a/src/float/division/cl_F_fceil1.cc +++ b/src/float/division/cl_F_fceil1.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_fceil2.cc b/src/float/division/cl_F_fceil2.cc index 0d9ca9b..7e457be 100644 --- a/src/float/division/cl_F_fceil2.cc +++ b/src/float/division/cl_F_fceil2.cc @@ -1,7 +1,7 @@ // fceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_ffloor1.cc b/src/float/division/cl_F_ffloor1.cc index 8b8da27..3d2d9f9 100644 --- a/src/float/division/cl_F_ffloor1.cc +++ b/src/float/division/cl_F_ffloor1.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_ffloor2.cc b/src/float/division/cl_F_ffloor2.cc index a2a5174..fc79c4f 100644 --- a/src/float/division/cl_F_ffloor2.cc +++ b/src/float/division/cl_F_ffloor2.cc @@ -1,7 +1,7 @@ // ffloor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_floor1.cc b/src/float/division/cl_F_floor1.cc index 4c9a64c..2e5ab02 100644 --- a/src/float/division/cl_F_floor1.cc +++ b/src/float/division/cl_F_floor1.cc @@ -1,7 +1,7 @@ // floor1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_floor2.cc b/src/float/division/cl_F_floor2.cc index 1363ff9..605441f 100644 --- a/src/float/division/cl_F_floor2.cc +++ b/src/float/division/cl_F_floor2.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,15 +9,15 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_floor22.cc b/src/float/division/cl_F_floor22.cc index 7d498ac..62d9865 100644 --- a/src/float/division/cl_F_floor22.cc +++ b/src/float/division/cl_F_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/division/cl_F_fround1.cc b/src/float/division/cl_F_fround1.cc index 553c2a1..1a3b6b7 100644 --- a/src/float/division/cl_F_fround1.cc +++ b/src/float/division/cl_F_fround1.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_fround2.cc b/src/float/division/cl_F_fround2.cc index 0d57c3e..5aa3789 100644 --- a/src/float/division/cl_F_fround2.cc +++ b/src/float/division/cl_F_fround2.cc @@ -1,7 +1,7 @@ // fround2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_ftrunc1.cc b/src/float/division/cl_F_ftrunc1.cc index 7f1e232..bf764aa 100644 --- a/src/float/division/cl_F_ftrunc1.cc +++ b/src/float/division/cl_F_ftrunc1.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_ftrunc2.cc b/src/float/division/cl_F_ftrunc2.cc index 553ac48..e7cd0a3 100644 --- a/src/float/division/cl_F_ftrunc2.cc +++ b/src/float/division/cl_F_ftrunc2.cc @@ -1,7 +1,7 @@ // ftruncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_round1.cc b/src/float/division/cl_F_round1.cc index 5f5b478..dbcd698 100644 --- a/src/float/division/cl_F_round1.cc +++ b/src/float/division/cl_F_round1.cc @@ -1,7 +1,7 @@ // round1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_round2.cc b/src/float/division/cl_F_round2.cc index 2569f25..47569c6 100644 --- a/src/float/division/cl_F_round2.cc +++ b/src/float/division/cl_F_round2.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,15 +9,15 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_round22.cc b/src/float/division/cl_F_round22.cc index 3dd774e..3b25cb0 100644 --- a/src/float/division/cl_F_round22.cc +++ b/src/float/division/cl_F_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/division/cl_F_trunc1.cc b/src/float/division/cl_F_trunc1.cc index 986349a..775a1fe 100644 --- a/src/float/division/cl_F_trunc1.cc +++ b/src/float/division/cl_F_trunc1.cc @@ -1,7 +1,7 @@ // truncate1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/division/cl_F_trunc2.cc b/src/float/division/cl_F_trunc2.cc index 9c4c3cd..92709c1 100644 --- a/src/float/division/cl_F_trunc2.cc +++ b/src/float/division/cl_F_trunc2.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,15 +9,15 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/division/cl_F_trunc22.cc b/src/float/division/cl_F_trunc22.cc index 221fd41..1461fdf 100644 --- a/src/float/division/cl_F_trunc22.cc +++ b/src/float/division/cl_F_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/elem/Makeflags b/src/float/elem/Makeflags deleted file mode 100644 index 704ccdc..0000000 --- a/src/float/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/lfloat/elem -I$(srcdir)/rational -I$(srcdir)/integer diff --git a/src/float/elem/cl_F_I_div.cc b/src/float/elem/cl_F_I_div.cc index 126b79d..e432d12 100644 --- a/src/float/elem/cl_F_I_div.cc +++ b/src/float/elem/cl_F_I_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_I_mul.cc b/src/float/elem/cl_F_I_mul.cc index dbd9cba..5d85f47 100644 --- a/src/float/elem/cl_F_I_mul.cc +++ b/src/float/elem/cl_F_I_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_RA_div.cc b/src/float/elem/cl_F_RA_div.cc index aa881ca..4eb5dd6 100644 --- a/src/float/elem/cl_F_RA_div.cc +++ b/src/float/elem/cl_F_RA_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_RA_mul.cc b/src/float/elem/cl_F_RA_mul.cc index 9eeb6be..b93fa7c 100644 --- a/src/float/elem/cl_F_RA_mul.cc +++ b/src/float/elem/cl_F_RA_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_compare.cc b/src/float/elem/cl_F_compare.cc index ff23cc8..879579d 100644 --- a/src/float/elem/cl_F_compare.cc +++ b/src/float/elem/cl_F_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_div.cc b/src/float/elem/cl_F_div.cc index 9364774..1f4ea6b 100644 --- a/src/float/elem/cl_F_div.cc +++ b/src/float/elem/cl_F_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_minus.cc b/src/float/elem/cl_F_minus.cc index c9882bc..196bf44 100644 --- a/src/float/elem/cl_F_minus.cc +++ b/src/float/elem/cl_F_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_minusp.cc b/src/float/elem/cl_F_minusp.cc index c405f66..ec769c8 100644 --- a/src/float/elem/cl_F_minusp.cc +++ b/src/float/elem/cl_F_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_minusp.cc" -#include "cl_FF_minusp.cc" -#include "cl_DF_minusp.cc" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" +#include "float/ffloat/elem/cl_FF_minusp.cc" +#include "float/dfloat/elem/cl_DF_minusp.cc" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/elem/cl_F_mul.cc b/src/float/elem/cl_F_mul.cc index bd578cb..d211529 100644 --- a/src/float/elem/cl_F_mul.cc +++ b/src/float/elem/cl_F_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_plus.cc b/src/float/elem/cl_F_plus.cc index 37923ec..74cab01 100644 --- a/src/float/elem/cl_F_plus.cc +++ b/src/float/elem/cl_F_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_F_plusp.cc b/src/float/elem/cl_F_plusp.cc index 23a4d92..c30b229 100644 --- a/src/float/elem/cl_F_plusp.cc +++ b/src/float/elem/cl_F_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline2.h" -#include "cl_SF_plusp.cc" -#include "cl_FF_plusp.cc" -#include "cl_DF_plusp.cc" -#include "cl_LF_plusp.cc" +#include "base/cl_inline2.h" +#include "float/sfloat/elem/cl_SF_plusp.cc" +#include "float/ffloat/elem/cl_FF_plusp.cc" +#include "float/dfloat/elem/cl_DF_plusp.cc" +#include "float/lfloat/elem/cl_LF_plusp.cc" namespace cln { diff --git a/src/float/elem/cl_F_recip.cc b/src/float/elem/cl_F_recip.cc index 54363a5..2fde825 100644 --- a/src/float/elem/cl_F_recip.cc +++ b/src/float/elem/cl_F_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/elem/cl_F_scale.cc b/src/float/elem/cl_F_scale.cc index b3f9f62..eb27dc5 100644 --- a/src/float/elem/cl_F_scale.cc +++ b/src/float/elem/cl_F_scale.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -13,7 +13,7 @@ #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/elem/cl_F_scale_I.cc b/src/float/elem/cl_F_scale_I.cc index d72184f..c26d957 100644 --- a/src/float/elem/cl_F_scale_I.cc +++ b/src/float/elem/cl_F_scale_I.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -13,7 +13,7 @@ #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/elem/cl_F_square.cc b/src/float/elem/cl_F_square.cc index b230a7b..32e16cb 100644 --- a/src/float/elem/cl_F_square.cc +++ b/src/float/elem/cl_F_square.cc @@ -1,7 +1,7 @@ // square(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/elem/cl_F_uminus.cc b/src/float/elem/cl_F_uminus.cc index 225e0ff..bedd7f7 100644 --- a/src/float/elem/cl_F_uminus.cc +++ b/src/float/elem/cl_F_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" diff --git a/src/float/elem/cl_F_zerop.cc b/src/float/elem/cl_F_zerop.cc index 0e21d28..4cefb69 100644 --- a/src/float/elem/cl_F_zerop.cc +++ b/src/float/elem/cl_F_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_zerop.cc" -#include "cl_FF_zerop.cc" -#include "cl_DF_zerop.cc" -#include "cl_LF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_zerop.cc" +#include "float/ffloat/elem/cl_FF_zerop.cc" +#include "float/dfloat/elem/cl_DF_zerop.cc" +#include "float/lfloat/elem/cl_LF_zerop.cc" namespace cln { diff --git a/src/float/elem/cl_I_F_div.cc b/src/float/elem/cl_I_F_div.cc index f1bc594..771cdd8 100644 --- a/src/float/elem/cl_I_F_div.cc +++ b/src/float/elem/cl_I_F_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/elem/cl_RA_F_div.cc b/src/float/elem/cl_RA_F_div.cc index 48d7888..3832426 100644 --- a/src/float/elem/cl_RA_F_div.cc +++ b/src/float/elem/cl_RA_F_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,16 +9,16 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/ffloat/Makeflags b/src/float/ffloat/Makeflags deleted file mode 100644 index fd4b67f..0000000 --- a/src/float/ffloat/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/float/ffloat -I$(srcdir)/float -I$(srcdir)/base diff --git a/src/float/ffloat/algebraic/Makeflags b/src/float/ffloat/algebraic/Makeflags deleted file mode 100644 index 1916d46..0000000 --- a/src/float/ffloat/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/ffloat/algebraic/cl_FF_sqrt.cc b/src/float/ffloat/algebraic/cl_FF_sqrt.cc index e0cdd2e..98a0ffc 100644 --- a/src/float/ffloat/algebraic/cl_FF_sqrt.cc +++ b/src/float/ffloat/algebraic/cl_FF_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_FF.h" -#include "cl_F.h" -#include "cl_low.h" +#include "float/ffloat/cl_FF.h" +#include "float/cl_F.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/float/ffloat/cl_FF.h b/src/float/ffloat/cl_FF.h index 1e2948f..84010ce 100644 --- a/src/float/ffloat/cl_FF.h +++ b/src/float/ffloat/cl_FF.h @@ -5,12 +5,12 @@ #include "cln/number.h" #include "cln/malloc.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #ifdef FAST_FLOAT -#include "cl_N.h" -#include "cl_F.h" +#include "base/cl_N.h" +#include "float/cl_F.h" #endif namespace cln { diff --git a/src/float/ffloat/conv/Makeflags b/src/float/ffloat/conv/Makeflags deleted file mode 100644 index 6d33d59..0000000 --- a/src/float/ffloat/conv/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/ffloat/conv/cl_FF_from_float.cc b/src/float/ffloat/conv/cl_FF_from_float.cc index 9f4d905..de9f01d 100644 --- a/src/float/ffloat/conv/cl_FF_from_float.cc +++ b/src/float/ffloat/conv/cl_FF_from_float.cc @@ -1,10 +1,10 @@ // cl_float_to_FF_pointer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/conv/cl_FF_to_floatj.cc b/src/float/ffloat/conv/cl_FF_to_floatj.cc index 8e04817..b31f92d 100644 --- a/src/float/ffloat/conv/cl_FF_to_floatj.cc +++ b/src/float/ffloat/conv/cl_FF_to_floatj.cc @@ -1,10 +1,10 @@ // cl_FF_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/conv/cl_I_to_float.cc b/src/float/ffloat/conv/cl_I_to_float.cc index 39827ff..0878ed4 100644 --- a/src/float/ffloat/conv/cl_I_to_float.cc +++ b/src/float/ffloat/conv/cl_I_to_float.cc @@ -1,7 +1,7 @@ // float_approx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_FF.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "float/ffloat/cl_FF.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/ffloat/conv/cl_RA_to_float.cc b/src/float/ffloat/conv/cl_RA_to_float.cc index 8153e9d..1e38f8f 100644 --- a/src/float/ffloat/conv/cl_RA_to_float.cc +++ b/src/float/ffloat/conv/cl_RA_to_float.cc @@ -1,7 +1,7 @@ // float_approx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_FF.h" -#include "cl_RA.h" +#include "float/ffloat/cl_FF.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/ffloat/division/Makeflags b/src/float/ffloat/division/Makeflags deleted file mode 100644 index ce55997..0000000 --- a/src/float/ffloat/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/ffloat/elem diff --git a/src/float/ffloat/division/cl_FF_ceil22.cc b/src/float/ffloat/division/cl_FF_ceil22.cc index a4c2742..3b5774b 100644 --- a/src/float/ffloat/division/cl_FF_ceil22.cc +++ b/src/float/ffloat/division/cl_FF_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/division/cl_FF_fceil.cc b/src/float/ffloat/division/cl_FF_fceil.cc index 97453d7..d8e2d63 100644 --- a/src/float/ffloat/division/cl_FF_fceil.cc +++ b/src/float/ffloat/division/cl_FF_fceil.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" -#include "cl_inline.h" -#include "cl_FF_minusp.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" namespace cln { diff --git a/src/float/ffloat/division/cl_FF_floor22.cc b/src/float/ffloat/division/cl_FF_floor22.cc index 9c165ef..3995a2f 100644 --- a/src/float/ffloat/division/cl_FF_floor22.cc +++ b/src/float/ffloat/division/cl_FF_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/division/cl_FF_recip.cc b/src/float/ffloat/division/cl_FF_recip.cc index 66c7aef..9f9a0eb 100644 --- a/src/float/ffloat/division/cl_FF_recip.cc +++ b/src/float/ffloat/division/cl_FF_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/division/cl_FF_round22.cc b/src/float/ffloat/division/cl_FF_round22.cc index 20973ff..64a61bc 100644 --- a/src/float/ffloat/division/cl_FF_round22.cc +++ b/src/float/ffloat/division/cl_FF_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/division/cl_FF_trunc22.cc b/src/float/ffloat/division/cl_FF_trunc22.cc index b959983..e8a368b 100644 --- a/src/float/ffloat/division/cl_FF_trunc22.cc +++ b/src/float/ffloat/division/cl_FF_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/Makeflags b/src/float/ffloat/elem/Makeflags deleted file mode 100644 index 15fe2a0..0000000 --- a/src/float/ffloat/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/base -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/ffloat/elem/cl_FF_compare.cc b/src/float/ffloat/elem/cl_FF_compare.cc index 6633c49..e5be89c 100644 --- a/src/float/ffloat/elem/cl_FF_compare.cc +++ b/src/float/ffloat/elem/cl_FF_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_div.cc b/src/float/ffloat/elem/cl_FF_div.cc index ac41927..7f1d802 100644 --- a/src/float/ffloat/elem/cl_FF_div.cc +++ b/src/float/ffloat/elem/cl_FF_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_FF.h" -#include "cl_N.h" -#include "cl_F.h" -#include "cl_low.h" +#include "float/ffloat/cl_FF.h" +#include "base/cl_N.h" +#include "float/cl_F.h" +#include "base/cl_low.h" -#include "cl_inline.h" -#include "cl_FF_zerop.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_zerop.cc" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_ffloor.cc b/src/float/ffloat/elem/cl_FF_ffloor.cc index 5468664..0cacc23 100644 --- a/src/float/ffloat/elem/cl_FF_ffloor.cc +++ b/src/float/ffloat/elem/cl_FF_ffloor.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" -#include "cl_inline.h" -#include "cl_FF_minusp.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_from_I.cc b/src/float/ffloat/elem/cl_FF_from_I.cc index ca12ca5..64f6080 100644 --- a/src/float/ffloat/elem/cl_FF_from_I.cc +++ b/src/float/ffloat/elem/cl_FF_from_I.cc @@ -1,18 +1,18 @@ // cl_I_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_from_RA.cc b/src/float/ffloat/elem/cl_FF_from_RA.cc index a36de45..bcec844 100644 --- a/src/float/ffloat/elem/cl_FF_from_RA.cc +++ b/src/float/ffloat/elem/cl_FF_from_RA.cc @@ -1,18 +1,18 @@ // cl_RA_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_fround.cc b/src/float/ffloat/elem/cl_FF_fround.cc index b5e81d3..5370001 100644 --- a/src/float/ffloat/elem/cl_FF_fround.cc +++ b/src/float/ffloat/elem/cl_FF_fround.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_ftrunc.cc b/src/float/ffloat/elem/cl_FF_ftrunc.cc index 6340c8c..183c9ac 100644 --- a/src/float/ffloat/elem/cl_FF_ftrunc.cc +++ b/src/float/ffloat/elem/cl_FF_ftrunc.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_futrunc.cc b/src/float/ffloat/elem/cl_FF_futrunc.cc index 198f9de..a365c07 100644 --- a/src/float/ffloat/elem/cl_FF_futrunc.cc +++ b/src/float/ffloat/elem/cl_FF_futrunc.cc @@ -1,10 +1,10 @@ // futruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" // Implementation. diff --git a/src/float/ffloat/elem/cl_FF_globals.cc b/src/float/ffloat/elem/cl_FF_globals.cc index 7c98cf6..2fcd64f 100644 --- a/src/float/ffloat/elem/cl_FF_globals.cc +++ b/src/float/ffloat/elem/cl_FF_globals.cc @@ -1,11 +1,11 @@ // Global variables for cl_FF. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat_class.h" -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" // Implementation. diff --git a/src/float/ffloat/elem/cl_FF_minus.cc b/src/float/ffloat/elem/cl_FF_minus.cc index 48045d3..96c4377 100644 --- a/src/float/ffloat/elem/cl_FF_minus.cc +++ b/src/float/ffloat/elem/cl_FF_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_minusp.cc b/src/float/ffloat/elem/cl_FF_minusp.cc index db9c0fd..196aef0 100644 --- a/src/float/ffloat/elem/cl_FF_minusp.cc +++ b/src/float/ffloat/elem/cl_FF_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_mul.cc b/src/float/ffloat/elem/cl_FF_mul.cc index 7127c8b..4332965 100644 --- a/src/float/ffloat/elem/cl_FF_mul.cc +++ b/src/float/ffloat/elem/cl_FF_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_FF.h" -#include "cl_F.h" -#include "cl_low.h" +#include "float/ffloat/cl_FF.h" +#include "float/cl_F.h" +#include "base/cl_low.h" -#include "cl_inline.h" -#include "cl_FF_zerop.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_zerop.cc" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_plus.cc b/src/float/ffloat/elem/cl_FF_plus.cc index 7937e2a..acdfb6d 100644 --- a/src/float/ffloat/elem/cl_FF_plus.cc +++ b/src/float/ffloat/elem/cl_FF_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_FF.h" -#include "cl_F.h" -#include "cl_xmacros.h" +#include "float/ffloat/cl_FF.h" +#include "float/cl_F.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_plusp.cc b/src/float/ffloat/elem/cl_FF_plusp.cc index dff8cb7..0d62199 100644 --- a/src/float/ffloat/elem/cl_FF_plusp.cc +++ b/src/float/ffloat/elem/cl_FF_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" -#include "cl_inline.h" -#include "cl_FF_minusp.cc" -#include "cl_FF_zerop.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" +#include "float/ffloat/elem/cl_FF_zerop.cc" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_scale.cc b/src/float/ffloat/elem/cl_FF_scale.cc index 51ff589..09bda07 100644 --- a/src/float/ffloat/elem/cl_FF_scale.cc +++ b/src/float/ffloat/elem/cl_FF_scale.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_FF.h" -#include "cl_F.h" +#include "float/ffloat/cl_FF.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_scale_I.cc b/src/float/ffloat/elem/cl_FF_scale_I.cc index 63d0332..9fd2118 100644 --- a/src/float/ffloat/elem/cl_FF_scale_I.cc +++ b/src/float/ffloat/elem/cl_FF_scale_I.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_FF.h" -#include "cl_F.h" -#include "cl_I.h" +#include "float/ffloat/cl_FF.h" +#include "float/cl_F.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_to_I.cc b/src/float/ffloat/elem/cl_FF_to_I.cc index dccf633..cb83be9 100644 --- a/src/float/ffloat/elem/cl_FF_to_I.cc +++ b/src/float/ffloat/elem/cl_FF_to_I.cc @@ -1,16 +1,16 @@ // cl_FF_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_uminus.cc b/src/float/ffloat/elem/cl_FF_uminus.cc index a125239..9c17491 100644 --- a/src/float/ffloat/elem/cl_FF_uminus.cc +++ b/src/float/ffloat/elem/cl_FF_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/elem/cl_FF_zerop.cc b/src/float/ffloat/elem/cl_FF_zerop.cc index 83b8837..5eba1ce 100644 --- a/src/float/ffloat/elem/cl_FF_zerop.cc +++ b/src/float/ffloat/elem/cl_FF_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/input/Makeflags b/src/float/ffloat/input/Makeflags deleted file mode 100644 index 1916d46..0000000 --- a/src/float/ffloat/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/ffloat/input/cl_FF_from_string.cc b/src/float/ffloat/input/cl_FF_from_string.cc index 8fd62a4..770fc91 100644 --- a/src/float/ffloat/input/cl_FF_from_string.cc +++ b/src/float/ffloat/input/cl_FF_from_string.cc @@ -1,7 +1,7 @@ // cl_FF (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat_class.h" diff --git a/src/float/ffloat/misc/Makeflags b/src/float/ffloat/misc/Makeflags deleted file mode 100644 index 4d80207..0000000 --- a/src/float/ffloat/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/ffloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/ffloat/misc/cl_FF_abs.cc b/src/float/ffloat/misc/cl_FF_abs.cc index 3b00afe..67c6c3b 100644 --- a/src/float/ffloat/misc/cl_FF_abs.cc +++ b/src/float/ffloat/misc/cl_FF_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_inline.h" -#include "cl_FF_minusp.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_as.cc b/src/float/ffloat/misc/cl_FF_as.cc index fac89fe..abbc4b2 100644 --- a/src/float/ffloat/misc/cl_FF_as.cc +++ b/src/float/ffloat/misc/cl_FF_as.cc @@ -1,7 +1,7 @@ // cl_FF_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_class.cc b/src/float/ffloat/misc/cl_FF_class.cc index b300fb8..861154a 100644 --- a/src/float/ffloat/misc/cl_FF_class.cc +++ b/src/float/ffloat/misc/cl_FF_class.cc @@ -1,7 +1,7 @@ // cl_class_ffloat. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" diff --git a/src/float/ffloat/misc/cl_FF_debug.cc b/src/float/ffloat/misc/cl_FF_debug.cc index 67122b8..ebfdc8d 100644 --- a/src/float/ffloat/misc/cl_FF_debug.cc +++ b/src/float/ffloat/misc/cl_FF_debug.cc @@ -1,7 +1,7 @@ // cl_FF debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/float/ffloat/misc/cl_FF_decode.cc b/src/float/ffloat/misc/cl_FF_decode.cc index ac23b1a..77f0cde 100644 --- a/src/float/ffloat/misc/cl_FF_decode.cc +++ b/src/float/ffloat/misc/cl_FF_decode.cc @@ -1,7 +1,7 @@ // decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_FF.h" -#include "cl_I.h" +#include "float/ffloat/cl_FF.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_digits.cc b/src/float/ffloat/misc/cl_FF_digits.cc index de7dff3..3e7cd6a 100644 --- a/src/float/ffloat/misc/cl_FF_digits.cc +++ b/src/float/ffloat/misc/cl_FF_digits.cc @@ -1,7 +1,7 @@ // float_digits(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_eqhashcode.cc b/src/float/ffloat/misc/cl_FF_eqhashcode.cc index dd6cf80..8e50d54 100644 --- a/src/float/ffloat/misc/cl_FF_eqhashcode.cc +++ b/src/float/ffloat/misc/cl_FF_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_FF equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_N.h" -#include "cl_FF.h" +#include "base/cl_N.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_exponent.cc b/src/float/ffloat/misc/cl_FF_exponent.cc index 4f60cea..d9d16a7 100644 --- a/src/float/ffloat/misc/cl_FF_exponent.cc +++ b/src/float/ffloat/misc/cl_FF_exponent.cc @@ -1,7 +1,7 @@ // float_exponent(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_idecode.cc b/src/float/ffloat/misc/cl_FF_idecode.cc index de76bea..26a28e3 100644 --- a/src/float/ffloat/misc/cl_FF_idecode.cc +++ b/src/float/ffloat/misc/cl_FF_idecode.cc @@ -1,7 +1,7 @@ // integer_decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_FF.h" -#include "cl_I.h" +#include "float/ffloat/cl_FF.h" +#include "integer/cl_I.h" #if defined(__mips__) && !defined(__GNUC__) // Workaround SGI Irix 6.2 C++ 7.0 bug. -#include "cl_F.h" +#include "float/cl_F.h" #include "dfloat/cl_DF.h" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_max.cc b/src/float/ffloat/misc/cl_FF_max.cc index e9ee704..13b5638 100644 --- a/src/float/ffloat/misc/cl_FF_max.cc +++ b/src/float/ffloat/misc/cl_FF_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" diff --git a/src/float/ffloat/misc/cl_FF_min.cc b/src/float/ffloat/misc/cl_FF_min.cc index 0fd4288..2ac4cc8 100644 --- a/src/float/ffloat/misc/cl_FF_min.cc +++ b/src/float/ffloat/misc/cl_FF_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" diff --git a/src/float/ffloat/misc/cl_FF_precision.cc b/src/float/ffloat/misc/cl_FF_precision.cc index d3cc653..6f23994 100644 --- a/src/float/ffloat/misc/cl_FF_precision.cc +++ b/src/float/ffloat/misc/cl_FF_precision.cc @@ -1,7 +1,7 @@ // float_precision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" -#include "cl_inline.h" -#include "cl_FF_zerop.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_zerop.cc" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_sign.cc b/src/float/ffloat/misc/cl_FF_sign.cc index 5f58a36..6733b2b 100644 --- a/src/float/ffloat/misc/cl_FF_sign.cc +++ b/src/float/ffloat/misc/cl_FF_sign.cc @@ -1,7 +1,7 @@ // float_sign(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" -#include "cl_inline.h" -#include "cl_FF_minusp.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" namespace cln { diff --git a/src/float/ffloat/misc/cl_FF_signum.cc b/src/float/ffloat/misc/cl_FF_signum.cc index 92b2071..deafe14 100644 --- a/src/float/ffloat/misc/cl_FF_signum.cc +++ b/src/float/ffloat/misc/cl_FF_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/ffloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" -#include "cl_inline.h" -#include "cl_FF_minusp.cc" -#include "cl_FF_zerop.cc" +#include "base/cl_inline.h" +#include "float/ffloat/elem/cl_FF_minusp.cc" +#include "float/ffloat/elem/cl_FF_zerop.cc" namespace cln { diff --git a/src/float/input/Makeflags b/src/float/input/Makeflags deleted file mode 100644 index ffd9450..0000000 --- a/src/float/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/string diff --git a/src/float/input/cl_F_from_string.cc b/src/float/input/cl_F_from_string.cc index f58be3c..e6d6787 100644 --- a/src/float/input/cl_F_from_string.cc +++ b/src/float/input/cl_F_from_string.cc @@ -1,7 +1,7 @@ // cl_F (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_class.h" diff --git a/src/float/input/cl_F_read.cc b/src/float/input/cl_F_read.cc index 6856d8c..7ba78fa 100644 --- a/src/float/input/cl_F_read.cc +++ b/src/float/input/cl_F_read.cc @@ -3,7 +3,7 @@ // It does not pull in all the generic real number code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" @@ -14,8 +14,8 @@ #include #include "cln/input.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" #undef floor #include diff --git a/src/float/input/cl_F_read_stream.cc b/src/float/input/cl_F_read_stream.cc index 83fafea..cd49e97 100644 --- a/src/float/input/cl_F_read_stream.cc +++ b/src/float/input/cl_F_read_stream.cc @@ -3,7 +3,7 @@ // It does not pull in all the generic real number code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" @@ -13,7 +13,7 @@ #include "cln/input.h" #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/float/input/cl_F_readparsed.cc b/src/float/input/cl_F_readparsed.cc index 3fbf63e..2097985 100644 --- a/src/float/input/cl_F_readparsed.cc +++ b/src/float/input/cl_F_readparsed.cc @@ -1,7 +1,7 @@ // read_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" @@ -10,19 +10,19 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/float.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/Makeflags b/src/float/lfloat/Makeflags deleted file mode 100644 index 39a5ca3..0000000 --- a/src/float/lfloat/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/float/lfloat/algebraic/Makeflags b/src/float/lfloat/algebraic/Makeflags deleted file mode 100644 index b886167..0000000 --- a/src/float/lfloat/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/lfloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/lfloat/algebraic/cl_LF_sqrt.cc b/src/float/lfloat/algebraic/cl_LF_sqrt.cc index 16c946e..b58f598 100644 --- a/src/float/lfloat/algebraic/cl_LF_sqrt.cc +++ b/src/float/lfloat/algebraic/cl_LF_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" +#include "base/digitseq/cl_DS.h" #include "cln/exception.h" namespace cln { diff --git a/src/float/lfloat/cl_LF_impl.h b/src/float/lfloat/cl_LF_impl.h index ad23dbe..72a91ef 100644 --- a/src/float/lfloat/cl_LF_impl.h +++ b/src/float/lfloat/cl_LF_impl.h @@ -4,10 +4,10 @@ #define _CL_LF_IMPL_H #include "cln/number.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/malloc.h" -#include "cl_offsetof.h" -#include "cl_DS.h" +#include "base/cl_offsetof.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/division/Makeflags b/src/float/lfloat/division/Makeflags deleted file mode 100644 index 8953135..0000000 --- a/src/float/lfloat/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/lfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/lfloat/elem diff --git a/src/float/lfloat/division/cl_LF_ceil22.cc b/src/float/lfloat/division/cl_LF_ceil22.cc index 0de3eb2..d5c281f 100644 --- a/src/float/lfloat/division/cl_LF_ceil22.cc +++ b/src/float/lfloat/division/cl_LF_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/division/cl_LF_fceil.cc b/src/float/lfloat/division/cl_LF_fceil.cc index bddc210..cfbb836 100644 --- a/src/float/lfloat/division/cl_LF_fceil.cc +++ b/src/float/lfloat/division/cl_LF_fceil.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/lfloat/division/cl_LF_floor22.cc b/src/float/lfloat/division/cl_LF_floor22.cc index 6e493e9..bc75140 100644 --- a/src/float/lfloat/division/cl_LF_floor22.cc +++ b/src/float/lfloat/division/cl_LF_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/division/cl_LF_recip.cc b/src/float/lfloat/division/cl_LF_recip.cc index 382e416..82f7b95 100644 --- a/src/float/lfloat/division/cl_LF_recip.cc +++ b/src/float/lfloat/division/cl_LF_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/lfloat/division/cl_LF_round22.cc b/src/float/lfloat/division/cl_LF_round22.cc index 962e8ec..49b3573 100644 --- a/src/float/lfloat/division/cl_LF_round22.cc +++ b/src/float/lfloat/division/cl_LF_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/division/cl_LF_trunc22.cc b/src/float/lfloat/division/cl_LF_trunc22.cc index 34458b5..8955a55 100644 --- a/src/float/lfloat/division/cl_LF_trunc22.cc +++ b/src/float/lfloat/division/cl_LF_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/Makeflags b/src/float/lfloat/elem/Makeflags deleted file mode 100644 index 9d837c7..0000000 --- a/src/float/lfloat/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/lfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer diff --git a/src/float/lfloat/elem/cl_I_LF_div.cc b/src/float/lfloat/elem/cl_I_LF_div.cc index ecff491..e187000 100644 --- a/src/float/lfloat/elem/cl_I_LF_div.cc +++ b/src/float/lfloat/elem/cl_I_LF_div.cc @@ -1,21 +1,21 @@ // cl_I_LF_div(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF_impl.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" -#include "cl_N.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_1minus.cc b/src/float/lfloat/elem/cl_LF_1minus.cc index 72d751b..c74ca23 100644 --- a/src/float/lfloat/elem/cl_LF_1minus.cc +++ b/src/float/lfloat/elem/cl_LF_1minus.cc @@ -1,16 +1,16 @@ // LF_LF_minus_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_1plus.cc b/src/float/lfloat/elem/cl_LF_1plus.cc index da7e887..8287b7b 100644 --- a/src/float/lfloat/elem/cl_LF_1plus.cc +++ b/src/float/lfloat/elem/cl_LF_1plus.cc @@ -1,18 +1,18 @@ // LF_LF_plus_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" -#include "cl_DS.h" -#include "cl_F.h" -#include "cl_xmacros.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_2minus.cc b/src/float/lfloat/elem/cl_LF_2minus.cc index 925d198..574bb2e 100644 --- a/src/float/lfloat/elem/cl_LF_2minus.cc +++ b/src/float/lfloat/elem/cl_LF_2minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_2plus.cc b/src/float/lfloat/elem/cl_LF_2plus.cc index 29d5f36..62d0126 100644 --- a/src/float/lfloat/elem/cl_LF_2plus.cc +++ b/src/float/lfloat/elem/cl_LF_2plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_I_div.cc b/src/float/lfloat/elem/cl_LF_I_div.cc index e60b394..4aa46ea 100644 --- a/src/float/lfloat/elem/cl_LF_I_div.cc +++ b/src/float/lfloat/elem/cl_LF_I_div.cc @@ -1,21 +1,21 @@ // cl_LF_I_div(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF_impl.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" -#include "cl_N.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_I_mul.cc b/src/float/lfloat/elem/cl_LF_I_mul.cc index b707d67..a307e7c 100644 --- a/src/float/lfloat/elem/cl_LF_I_mul.cc +++ b/src/float/lfloat/elem/cl_LF_I_mul.cc @@ -1,19 +1,19 @@ // cl_LF_I_mul(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF_impl.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_RA_div.cc b/src/float/lfloat/elem/cl_LF_RA_div.cc index 091eae3..b637eed 100644 --- a/src/float/lfloat/elem/cl_LF_RA_div.cc +++ b/src/float/lfloat/elem/cl_LF_RA_div.cc @@ -1,17 +1,17 @@ // cl_LF_RA_div(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/lfloat.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_RA_mul.cc b/src/float/lfloat/elem/cl_LF_RA_mul.cc index 905bc06..8abc945 100644 --- a/src/float/lfloat/elem/cl_LF_RA_mul.cc +++ b/src/float/lfloat/elem/cl_LF_RA_mul.cc @@ -1,16 +1,16 @@ // cl_LF_RA_mul(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/lfloat.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_compare.cc b/src/float/lfloat/elem/cl_LF_compare.cc index 5e3b621..521ede8 100644 --- a/src/float/lfloat/elem/cl_LF_compare.cc +++ b/src/float/lfloat/elem/cl_LF_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_LF.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_div.cc b/src/float/lfloat/elem/cl_LF_div.cc index 291b3a1..ce0f4e6 100644 --- a/src/float/lfloat/elem/cl_LF_div.cc +++ b/src/float/lfloat/elem/cl_LF_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" -#include "cl_F.h" -#include "cl_N.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_ffloor.cc b/src/float/lfloat/elem/cl_LF_ffloor.cc index 0aaa639..317fb64 100644 --- a/src/float/lfloat/elem/cl_LF_ffloor.cc +++ b/src/float/lfloat/elem/cl_LF_ffloor.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_from_I.cc b/src/float/lfloat/elem/cl_LF_from_I.cc index bbb4cec..d130940 100644 --- a/src/float/lfloat/elem/cl_LF_from_I.cc +++ b/src/float/lfloat/elem/cl_LF_from_I.cc @@ -1,19 +1,19 @@ // cl_I_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF_impl.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_from_RA.cc b/src/float/lfloat/elem/cl_LF_from_RA.cc index b66647b..16f2ec7 100644 --- a/src/float/lfloat/elem/cl_LF_from_RA.cc +++ b/src/float/lfloat/elem/cl_LF_from_RA.cc @@ -1,19 +1,19 @@ // cl_RA_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" -#include "cl_RA.h" +#include "float/lfloat/cl_LF_impl.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_fround.cc b/src/float/lfloat/elem/cl_LF_fround.cc index f2b40b2..7dfb4ba 100644 --- a/src/float/lfloat/elem/cl_LF_fround.cc +++ b/src/float/lfloat/elem/cl_LF_fround.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_ftrunc.cc b/src/float/lfloat/elem/cl_LF_ftrunc.cc index 73eba4a..fd04d78 100644 --- a/src/float/lfloat/elem/cl_LF_ftrunc.cc +++ b/src/float/lfloat/elem/cl_LF_ftrunc.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_futrunc.cc b/src/float/lfloat/elem/cl_LF_futrunc.cc index 3a7d4cd..ea4eee1 100644 --- a/src/float/lfloat/elem/cl_LF_futrunc.cc +++ b/src/float/lfloat/elem/cl_LF_futrunc.cc @@ -1,16 +1,16 @@ // futruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_globals.cc b/src/float/lfloat/elem/cl_LF_globals.cc index 47c754e..07038f8 100644 --- a/src/float/lfloat/elem/cl_LF_globals.cc +++ b/src/float/lfloat/elem/cl_LF_globals.cc @@ -1,7 +1,7 @@ // Global variables for cl_LF. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/number.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_minus1.cc b/src/float/lfloat/elem/cl_LF_minus1.cc index 652c4f3..c0209e4 100644 --- a/src/float/lfloat/elem/cl_LF_minus1.cc +++ b/src/float/lfloat/elem/cl_LF_minus1.cc @@ -1,7 +1,7 @@ // minus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_minusp.cc b/src/float/lfloat/elem/cl_LF_minusp.cc index 3fd4ef8..d961ef4 100644 --- a/src/float/lfloat/elem/cl_LF_minusp.cc +++ b/src/float/lfloat/elem/cl_LF_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_mul.cc b/src/float/lfloat/elem/cl_LF_mul.cc index 6132d05..70b81f9 100644 --- a/src/float/lfloat/elem/cl_LF_mul.cc +++ b/src/float/lfloat/elem/cl_LF_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_plus1.cc b/src/float/lfloat/elem/cl_LF_plus1.cc index e539f6b..9b033f0 100644 --- a/src/float/lfloat/elem/cl_LF_plus1.cc +++ b/src/float/lfloat/elem/cl_LF_plus1.cc @@ -1,7 +1,7 @@ // plus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_plusp.cc b/src/float/lfloat/elem/cl_LF_plusp.cc index d3a1100..1672a87 100644 --- a/src/float/lfloat/elem/cl_LF_plusp.cc +++ b/src/float/lfloat/elem/cl_LF_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" -#include "cl_LF_zerop.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" +#include "float/lfloat/elem/cl_LF_zerop.cc" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_scale.cc b/src/float/lfloat/elem/cl_LF_scale.cc index 4785273..9a2e467 100644 --- a/src/float/lfloat/elem/cl_LF_scale.cc +++ b/src/float/lfloat/elem/cl_LF_scale.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_scale_I.cc b/src/float/lfloat/elem/cl_LF_scale_I.cc index 12c68d9..12010f3 100644 --- a/src/float/lfloat/elem/cl_LF_scale_I.cc +++ b/src/float/lfloat/elem/cl_LF_scale_I.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" -#include "cl_I.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_square.cc b/src/float/lfloat/elem/cl_LF_square.cc index c22a1f3..0238419 100644 --- a/src/float/lfloat/elem/cl_LF_square.cc +++ b/src/float/lfloat/elem/cl_LF_square.cc @@ -1,7 +1,7 @@ // square(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_to_I.cc b/src/float/lfloat/elem/cl_LF_to_I.cc index 3abe9b1..6716fcd 100644 --- a/src/float/lfloat/elem/cl_LF_to_I.cc +++ b/src/float/lfloat/elem/cl_LF_to_I.cc @@ -1,20 +1,20 @@ // cl_LF_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_uminus.cc b/src/float/lfloat/elem/cl_LF_uminus.cc index 4e31ddf..8a5866a 100644 --- a/src/float/lfloat/elem/cl_LF_uminus.cc +++ b/src/float/lfloat/elem/cl_LF_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_LF_zerop.cc b/src/float/lfloat/elem/cl_LF_zerop.cc index af83bed..5ec5211 100644 --- a/src/float/lfloat/elem/cl_LF_zerop.cc +++ b/src/float/lfloat/elem/cl_LF_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/elem/cl_RA_LF_div.cc b/src/float/lfloat/elem/cl_RA_LF_div.cc index 78ad0d0..db29e7f 100644 --- a/src/float/lfloat/elem/cl_RA_LF_div.cc +++ b/src/float/lfloat/elem/cl_RA_LF_div.cc @@ -1,16 +1,16 @@ // cl_RA_LF_div(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/lfloat.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/float/lfloat/input/Makeflags b/src/float/lfloat/input/Makeflags deleted file mode 100644 index b886167..0000000 --- a/src/float/lfloat/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/lfloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/lfloat/input/cl_LF_from_string.cc b/src/float/lfloat/input/cl_LF_from_string.cc index 107020f..85bda26 100644 --- a/src/float/lfloat/input/cl_LF_from_string.cc +++ b/src/float/lfloat/input/cl_LF_from_string.cc @@ -1,7 +1,7 @@ // cl_LF (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat_class.h" diff --git a/src/float/lfloat/misc/Makeflags b/src/float/lfloat/misc/Makeflags deleted file mode 100644 index 68f60c4..0000000 --- a/src/float/lfloat/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/lfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/lfloat/elem -I$(srcdir)/integer diff --git a/src/float/lfloat/misc/cl_LF_abs.cc b/src/float/lfloat/misc/cl_LF_abs.cc index b46bdad..6f49680 100644 --- a/src/float/lfloat/misc/cl_LF_abs.cc +++ b/src/float/lfloat/misc/cl_LF_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_as.cc b/src/float/lfloat/misc/cl_LF_as.cc index 47312db..dedbd2e 100644 --- a/src/float/lfloat/misc/cl_LF_as.cc +++ b/src/float/lfloat/misc/cl_LF_as.cc @@ -1,7 +1,7 @@ // cl_LF_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_class.cc b/src/float/lfloat/misc/cl_LF_class.cc index c44546b..fe18c98 100644 --- a/src/float/lfloat/misc/cl_LF_class.cc +++ b/src/float/lfloat/misc/cl_LF_class.cc @@ -1,7 +1,7 @@ // cl_class_lfloat. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" diff --git a/src/float/lfloat/misc/cl_LF_debug.cc b/src/float/lfloat/misc/cl_LF_debug.cc index 51e1676..83f8c50 100644 --- a/src/float/lfloat/misc/cl_LF_debug.cc +++ b/src/float/lfloat/misc/cl_LF_debug.cc @@ -1,7 +1,7 @@ // cl_LF debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/float/lfloat/misc/cl_LF_decode.cc b/src/float/lfloat/misc/cl_LF_decode.cc index a65e142..5c11542 100644 --- a/src/float/lfloat/misc/cl_LF_decode.cc +++ b/src/float/lfloat/misc/cl_LF_decode.cc @@ -1,7 +1,7 @@ // decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_I.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_digits.cc b/src/float/lfloat/misc/cl_LF_digits.cc index fd9edef..5f8e321 100644 --- a/src/float/lfloat/misc/cl_LF_digits.cc +++ b/src/float/lfloat/misc/cl_LF_digits.cc @@ -1,7 +1,7 @@ // float_digits(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_eqhashcode.cc b/src/float/lfloat/misc/cl_LF_eqhashcode.cc index 509daf7..965a668 100644 --- a/src/float/lfloat/misc/cl_LF_eqhashcode.cc +++ b/src/float/lfloat/misc/cl_LF_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_LF equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_N.h" -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "base/cl_N.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_exponent.cc b/src/float/lfloat/misc/cl_LF_exponent.cc index e80c72e..48a25bb 100644 --- a/src/float/lfloat/misc/cl_LF_exponent.cc +++ b/src/float/lfloat/misc/cl_LF_exponent.cc @@ -1,7 +1,7 @@ // float_exponent(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_extend.cc b/src/float/lfloat/misc/cl_LF_extend.cc index ba43053..9561f88 100644 --- a/src/float/lfloat/misc/cl_LF_extend.cc +++ b/src/float/lfloat/misc/cl_LF_extend.cc @@ -1,16 +1,16 @@ // extend(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_idecode.cc b/src/float/lfloat/misc/cl_LF_idecode.cc index 5e490cf..3eeb5e6 100644 --- a/src/float/lfloat/misc/cl_LF_idecode.cc +++ b/src/float/lfloat/misc/cl_LF_idecode.cc @@ -1,7 +1,7 @@ // integer_decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_LF.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_leninc.cc b/src/float/lfloat/misc/cl_LF_leninc.cc index b1de23b..ee84951 100644 --- a/src/float/lfloat/misc/cl_LF_leninc.cc +++ b/src/float/lfloat/misc/cl_LF_leninc.cc @@ -1,10 +1,10 @@ // cl_LF_len_incsqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. diff --git a/src/float/lfloat/misc/cl_LF_lenincx.cc b/src/float/lfloat/misc/cl_LF_lenincx.cc index 0a670f6..7e94e11 100644 --- a/src/float/lfloat/misc/cl_LF_lenincx.cc +++ b/src/float/lfloat/misc/cl_LF_lenincx.cc @@ -1,10 +1,10 @@ // cl_LF_len_incsqrtx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. diff --git a/src/float/lfloat/misc/cl_LF_max.cc b/src/float/lfloat/misc/cl_LF_max.cc index 3b8729e..c3b81be 100644 --- a/src/float/lfloat/misc/cl_LF_max.cc +++ b/src/float/lfloat/misc/cl_LF_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" diff --git a/src/float/lfloat/misc/cl_LF_min.cc b/src/float/lfloat/misc/cl_LF_min.cc index 60ca93f..52bc925 100644 --- a/src/float/lfloat/misc/cl_LF_min.cc +++ b/src/float/lfloat/misc/cl_LF_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" diff --git a/src/float/lfloat/misc/cl_LF_precision.cc b/src/float/lfloat/misc/cl_LF_precision.cc index 66798a4..dff93b7 100644 --- a/src/float/lfloat/misc/cl_LF_precision.cc +++ b/src/float/lfloat/misc/cl_LF_precision.cc @@ -1,7 +1,7 @@ // float_precision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_shorten.cc b/src/float/lfloat/misc/cl_LF_shorten.cc index 35635bd..5445d90 100644 --- a/src/float/lfloat/misc/cl_LF_shorten.cc +++ b/src/float/lfloat/misc/cl_LF_shorten.cc @@ -1,17 +1,17 @@ // shorten(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_LF_impl.h" -#include "cl_DS.h" -#include "cl_F.h" +#include "float/lfloat/cl_LF_impl.h" +#include "base/digitseq/cl_DS.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_shortenrel.cc b/src/float/lfloat/misc/cl_LF_shortenrel.cc index 274bf5b..cf69e17 100644 --- a/src/float/lfloat/misc/cl_LF_shortenrel.cc +++ b/src/float/lfloat/misc/cl_LF_shortenrel.cc @@ -1,20 +1,20 @@ // cl_LF_shortenrelative(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/exception.h" -#include "cl_inline2.h" -#include "cl_LF_precision.cc" -#include "cl_inline.h" -#include "cl_LF_exponent.cc" +#include "base/cl_inline2.h" +#include "float/lfloat/misc/cl_LF_precision.cc" +#include "base/cl_inline.h" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_shortenwith.cc b/src/float/lfloat/misc/cl_LF_shortenwith.cc index 0cb6e63..b4c2949 100644 --- a/src/float/lfloat/misc/cl_LF_shortenwith.cc +++ b/src/float/lfloat/misc/cl_LF_shortenwith.cc @@ -1,18 +1,18 @@ // cl_LF_shortenwith(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. -#include "cl_inline2.h" -#include "cl_LF_precision.cc" -#include "cl_inline.h" -#include "cl_LF_exponent.cc" +#include "base/cl_inline2.h" +#include "float/lfloat/misc/cl_LF_precision.cc" +#include "base/cl_inline.h" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_sign.cc b/src/float/lfloat/misc/cl_LF_sign.cc index 9fd0708..a6bf59d 100644 --- a/src/float/lfloat/misc/cl_LF_sign.cc +++ b/src/float/lfloat/misc/cl_LF_sign.cc @@ -1,7 +1,7 @@ // float_sign(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_signum.cc b/src/float/lfloat/misc/cl_LF_signum.cc index a658e18..c06c7e5 100644 --- a/src/float/lfloat/misc/cl_LF_signum.cc +++ b/src/float/lfloat/misc/cl_LF_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/lfloat.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" -#include "cl_LF_zerop.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" +#include "float/lfloat/elem/cl_LF_zerop.cc" namespace cln { diff --git a/src/float/lfloat/misc/cl_LF_to_LF.cc b/src/float/lfloat/misc/cl_LF_to_LF.cc index 33232d5..9c62b23 100644 --- a/src/float/lfloat/misc/cl_LF_to_LF.cc +++ b/src/float/lfloat/misc/cl_LF_to_LF.cc @@ -1,10 +1,10 @@ // LF_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. diff --git a/src/float/misc/Makeflags b/src/float/misc/Makeflags deleted file mode 100644 index 908269e..0000000 --- a/src/float/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/sfloat/misc -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/ffloat/misc -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/dfloat/misc -I$(srcdir)/float/lfloat/elem -I$(srcdir)/float/lfloat/misc -I$(srcdir)/rational -I$(srcdir)/integer diff --git a/src/float/misc/cl_F_abs.cc b/src/float/misc/cl_F_abs.cc index 9fe43d2..fb97af3 100644 --- a/src/float/misc/cl_F_abs.cc +++ b/src/float/misc/cl_F_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,17 +9,17 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_inline.h" -#include "cl_SF_minusp.cc" -#include "cl_FF_minusp.cc" -#include "cl_DF_minusp.cc" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" +#include "float/ffloat/elem/cl_FF_minusp.cc" +#include "float/dfloat/elem/cl_DF_minusp.cc" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/float/misc/cl_F_as.cc b/src/float/misc/cl_F_as.cc index 4677bb4..7bbbdb2 100644 --- a/src/float/misc/cl_F_as.cc +++ b/src/float/misc/cl_F_as.cc @@ -1,7 +1,7 @@ // cl_F_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/misc/cl_F_decode.cc b/src/float/misc/cl_F_decode.cc index 42f9771..367d1d6 100644 --- a/src/float/misc/cl_F_decode.cc +++ b/src/float/misc/cl_F_decode.cc @@ -1,7 +1,7 @@ // decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_I.h" -#include "cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/misc/cl_F_digits.cc b/src/float/misc/cl_F_digits.cc index caf26d0..1a796a2 100644 --- a/src/float/misc/cl_F_digits.cc +++ b/src/float/misc/cl_F_digits.cc @@ -1,7 +1,7 @@ // float_digits(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_digits.cc" -#include "cl_FF_digits.cc" -#include "cl_DF_digits.cc" -#include "cl_LF_digits.cc" +#include "base/cl_inline.h" +#include "float/sfloat/misc/cl_SF_digits.cc" +#include "float/ffloat/misc/cl_FF_digits.cc" +#include "float/dfloat/misc/cl_DF_digits.cc" +#include "float/lfloat/misc/cl_LF_digits.cc" namespace cln { diff --git a/src/float/misc/cl_F_epsneg.cc b/src/float/misc/cl_F_epsneg.cc index 577bce1..5332575 100644 --- a/src/float/misc/cl_F_epsneg.cc +++ b/src/float/misc/cl_F_epsneg.cc @@ -1,19 +1,19 @@ // float_negative_epsilon(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/misc/cl_F_epspos.cc b/src/float/misc/cl_F_epspos.cc index 8342def..1cba5b4 100644 --- a/src/float/misc/cl_F_epspos.cc +++ b/src/float/misc/cl_F_epspos.cc @@ -1,19 +1,19 @@ // float_epsilon(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/misc/cl_F_eqhashcode.cc b/src/float/misc/cl_F_eqhashcode.cc index 5687ee3..043b413 100644 --- a/src/float/misc/cl_F_eqhashcode.cc +++ b/src/float/misc/cl_F_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_F equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_N.h" -#include "cl_F.h" +#include "base/cl_N.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_eqhashcode.cc" -#include "cl_FF_eqhashcode.cc" -#include "cl_DF_eqhashcode.cc" -#include "cl_LF_eqhashcode.cc" +#include "base/cl_inline.h" +#include "float/sfloat/misc/cl_SF_eqhashcode.cc" +#include "float/ffloat/misc/cl_FF_eqhashcode.cc" +#include "float/dfloat/misc/cl_DF_eqhashcode.cc" +#include "float/lfloat/misc/cl_LF_eqhashcode.cc" namespace cln { diff --git a/src/float/misc/cl_F_exponent.cc b/src/float/misc/cl_F_exponent.cc index 55b1a58..416cfe4 100644 --- a/src/float/misc/cl_F_exponent.cc +++ b/src/float/misc/cl_F_exponent.cc @@ -1,7 +1,7 @@ // float_exponent(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_exponent.cc" -#include "cl_FF_exponent.cc" -#include "cl_DF_exponent.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/sfloat/misc/cl_SF_exponent.cc" +#include "float/ffloat/misc/cl_FF_exponent.cc" +#include "float/dfloat/misc/cl_DF_exponent.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/misc/cl_F_extendsqrt.cc b/src/float/misc/cl_F_extendsqrt.cc index 89aa209..fafa9d8 100644 --- a/src/float/misc/cl_F_extendsqrt.cc +++ b/src/float/misc/cl_F_extendsqrt.cc @@ -1,16 +1,16 @@ // cl_F_extendsqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_SF.h" -#include "cl_LF.h" +#include "float/sfloat/cl_SF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/misc/cl_F_extendsqrtx.cc b/src/float/misc/cl_F_extendsqrtx.cc index 51e9fa3..794c33f 100644 --- a/src/float/misc/cl_F_extendsqrtx.cc +++ b/src/float/misc/cl_F_extendsqrtx.cc @@ -1,16 +1,16 @@ // cl_F_extendsqrtx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_SF.h" -#include "cl_LF.h" +#include "float/sfloat/cl_SF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/misc/cl_F_idecode.cc b/src/float/misc/cl_F_idecode.cc index 0a55da0..908ce88 100644 --- a/src/float/misc/cl_F_idecode.cc +++ b/src/float/misc/cl_F_idecode.cc @@ -1,7 +1,7 @@ // integer_decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_idecode.cc" -#include "cl_FF_idecode.cc" -#include "cl_DF_idecode.cc" -#include "cl_LF_idecode.cc" +#include "base/cl_inline.h" +#include "float/sfloat/misc/cl_SF_idecode.cc" +#include "float/ffloat/misc/cl_FF_idecode.cc" +#include "float/dfloat/misc/cl_DF_idecode.cc" +#include "float/lfloat/misc/cl_LF_idecode.cc" namespace cln { diff --git a/src/float/misc/cl_F_leastneg.cc b/src/float/misc/cl_F_leastneg.cc index bcdf0a8..0f130c2 100644 --- a/src/float/misc/cl_F_leastneg.cc +++ b/src/float/misc/cl_F_leastneg.cc @@ -1,19 +1,19 @@ // least_negative_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/misc/cl_F_leastpos.cc b/src/float/misc/cl_F_leastpos.cc index 8bd1f95..34664ae 100644 --- a/src/float/misc/cl_F_leastpos.cc +++ b/src/float/misc/cl_F_leastpos.cc @@ -1,19 +1,19 @@ // least_positive_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/misc/cl_F_max.cc b/src/float/misc/cl_F_max.cc index c6bd35e..44d20f2 100644 --- a/src/float/misc/cl_F_max.cc +++ b/src/float/misc/cl_F_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" diff --git a/src/float/misc/cl_F_min.cc b/src/float/misc/cl_F_min.cc index 104b6aa..fff8701 100644 --- a/src/float/misc/cl_F_min.cc +++ b/src/float/misc/cl_F_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" diff --git a/src/float/misc/cl_F_mostneg.cc b/src/float/misc/cl_F_mostneg.cc index c393fa6..674d537 100644 --- a/src/float/misc/cl_F_mostneg.cc +++ b/src/float/misc/cl_F_mostneg.cc @@ -1,19 +1,19 @@ // most_negative_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/misc/cl_F_mostpos.cc b/src/float/misc/cl_F_mostpos.cc index d273db5..780a767 100644 --- a/src/float/misc/cl_F_mostpos.cc +++ b/src/float/misc/cl_F_mostpos.cc @@ -1,19 +1,19 @@ // most_positive_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" // Implementation. -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" namespace cln { diff --git a/src/float/misc/cl_F_precision.cc b/src/float/misc/cl_F_precision.cc index 1d9c770..b9469b5 100644 --- a/src/float/misc/cl_F_precision.cc +++ b/src/float/misc/cl_F_precision.cc @@ -1,7 +1,7 @@ // float_precision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline2.h" -#include "cl_SF_precision.cc" -#include "cl_FF_precision.cc" -#include "cl_DF_precision.cc" -#include "cl_LF_precision.cc" +#include "base/cl_inline2.h" +#include "float/sfloat/misc/cl_SF_precision.cc" +#include "float/ffloat/misc/cl_FF_precision.cc" +#include "float/dfloat/misc/cl_DF_precision.cc" +#include "float/lfloat/misc/cl_LF_precision.cc" namespace cln { diff --git a/src/float/misc/cl_F_rational.cc b/src/float/misc/cl_F_rational.cc index 402bc42..c15a373 100644 --- a/src/float/misc/cl_F_rational.cc +++ b/src/float/misc/cl_F_rational.cc @@ -1,7 +1,7 @@ // rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/integer.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/float/misc/cl_F_shortenrel.cc b/src/float/misc/cl_F_shortenrel.cc index fec6cae..32995e9 100644 --- a/src/float/misc/cl_F_shortenrel.cc +++ b/src/float/misc/cl_F_shortenrel.cc @@ -1,15 +1,15 @@ // cl_F_shortenrelative(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F.h" +#include "float/cl_F.h" // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/exception.h" namespace cln { diff --git a/src/float/misc/cl_F_sign.cc b/src/float/misc/cl_F_sign.cc index 03d8614..4ee35b8 100644 --- a/src/float/misc/cl_F_sign.cc +++ b/src/float/misc/cl_F_sign.cc @@ -1,7 +1,7 @@ // float_sign(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline2.h" -#include "cl_SF_sign.cc" -#include "cl_FF_sign.cc" -#include "cl_DF_sign.cc" -#include "cl_LF_sign.cc" +#include "base/cl_inline2.h" +#include "float/sfloat/misc/cl_SF_sign.cc" +#include "float/ffloat/misc/cl_FF_sign.cc" +#include "float/dfloat/misc/cl_DF_sign.cc" +#include "float/lfloat/misc/cl_LF_sign.cc" namespace cln { diff --git a/src/float/misc/cl_F_sign2.cc b/src/float/misc/cl_F_sign2.cc index 9e13494..127d9b2 100644 --- a/src/float/misc/cl_F_sign2.cc +++ b/src/float/misc/cl_F_sign2.cc @@ -1,7 +1,7 @@ // float_sign(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/misc/cl_F_signum.cc b/src/float/misc/cl_F_signum.cc index 3e2af1a..5dc1b55 100644 --- a/src/float/misc/cl_F_signum.cc +++ b/src/float/misc/cl_F_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" /* Use inline versions of signum(cl_{SF,FF,DF,LF}) functions */ -#include "cl_inline2.h" -#include "cl_SF_signum.cc" -#include "cl_FF_signum.cc" -#include "cl_DF_signum.cc" -#include "cl_LF_signum.cc" +#include "base/cl_inline2.h" +#include "float/sfloat/misc/cl_SF_signum.cc" +#include "float/ffloat/misc/cl_FF_signum.cc" +#include "float/dfloat/misc/cl_DF_signum.cc" +#include "float/lfloat/misc/cl_LF_signum.cc" namespace cln { diff --git a/src/float/misc/cl_float_format.cc b/src/float/misc/cl_float_format.cc index 217582c..62a81e4 100644 --- a/src/float/misc/cl_float_format.cc +++ b/src/float/misc/cl_float_format.cc @@ -1,7 +1,7 @@ // float_format(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" diff --git a/src/float/output/Makeflags b/src/float/output/Makeflags deleted file mode 100644 index 23a5d1e..0000000 --- a/src/float/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/transcendental -I$(srcdir)/integer -I$(srcdir)/base/string diff --git a/src/float/output/cl_F_aprint.cc b/src/float/output/cl_F_aprint.cc index 2749c92..e4011f5 100644 --- a/src/float/output/cl_F_aprint.cc +++ b/src/float/output/cl_F_aprint.cc @@ -1,7 +1,7 @@ // print_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" diff --git a/src/float/output/cl_F_bprint.cc b/src/float/output/cl_F_bprint.cc index bfd7899..778895b 100644 --- a/src/float/output/cl_F_bprint.cc +++ b/src/float/output/cl_F_bprint.cc @@ -1,7 +1,7 @@ // print_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" diff --git a/src/float/output/cl_F_cprint.cc b/src/float/output/cl_F_cprint.cc index 5145131..b16ffb3 100644 --- a/src/float/output/cl_F_cprint.cc +++ b/src/float/output/cl_F_cprint.cc @@ -1,7 +1,7 @@ // print_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" diff --git a/src/float/output/cl_F_dprint.cc b/src/float/output/cl_F_dprint.cc index e3deccc..be51cb0 100644 --- a/src/float/output/cl_F_dprint.cc +++ b/src/float/output/cl_F_dprint.cc @@ -1,7 +1,7 @@ // print_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" @@ -30,15 +30,15 @@ #include #include "cln/output.h" -#include "cl_sstring.h" +#include "base/string/cl_sstring.h" #include "cln/float.h" -#include "cl_F.h" -#include "cl_LF.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" +#include "float/transcendental/cl_F_tran.h" #include "cln/rational.h" #include "cln/integer.h" #include "cln/integer_io.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/output/cl_F_printb.cc b/src/float/output/cl_F_printb.cc index e55f6cc..d1da6d6 100644 --- a/src/float/output/cl_F_printb.cc +++ b/src/float/output/cl_F_printb.cc @@ -1,7 +1,7 @@ // print_float_binary(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float_io.h" @@ -10,9 +10,9 @@ // Implementation. #include "cln/float.h" -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/integer_io.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/random/Makeflags b/src/float/random/Makeflags deleted file mode 100644 index bf12bd2..0000000 --- a/src/float/random/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/integer -I$(srcdir)/base/random diff --git a/src/float/random/cl_F_random.cc b/src/float/random/cl_F_random.cc index 80cb9a8..1f4de92 100644 --- a/src/float/random/cl_F_random.cc +++ b/src/float/random/cl_F_random.cc @@ -1,7 +1,7 @@ // random_F(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_random_impl.h" -#include "cl_DS.h" -#include "cl_I.h" +#include "base/random/cl_random_impl.h" +#include "base/digitseq/cl_DS.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/sfloat/Makeflags b/src/float/sfloat/Makeflags deleted file mode 100644 index 944ef25..0000000 --- a/src/float/sfloat/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/float/sfloat -I$(srcdir)/float -I$(srcdir)/base diff --git a/src/float/sfloat/algebraic/Makeflags b/src/float/sfloat/algebraic/Makeflags deleted file mode 100644 index 25e2d20..0000000 --- a/src/float/sfloat/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/sfloat/algebraic/cl_SF_sqrt.cc b/src/float/sfloat/algebraic/cl_SF_sqrt.cc index 7fa6309..be5176e 100644 --- a/src/float/sfloat/algebraic/cl_SF_sqrt.cc +++ b/src/float/sfloat/algebraic/cl_SF_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_low.h" +#include "float/sfloat/cl_SF.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/float/sfloat/cl_SF.h b/src/float/sfloat/cl_SF.h index 9329133..ca3b6e7 100644 --- a/src/float/sfloat/cl_SF.h +++ b/src/float/sfloat/cl_SF.h @@ -4,7 +4,7 @@ #define _CL_SF_H #include "cln/number.h" -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/sfloat/division/Makeflags b/src/float/sfloat/division/Makeflags deleted file mode 100644 index 7f060ee..0000000 --- a/src/float/sfloat/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem diff --git a/src/float/sfloat/division/cl_SF_ceil22.cc b/src/float/sfloat/division/cl_SF_ceil22.cc index db837ea..5a211eb 100644 --- a/src/float/sfloat/division/cl_SF_ceil22.cc +++ b/src/float/sfloat/division/cl_SF_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/division/cl_SF_fceil.cc b/src/float/sfloat/division/cl_SF_fceil.cc index 53ae70e..8d27127 100644 --- a/src/float/sfloat/division/cl_SF_fceil.cc +++ b/src/float/sfloat/division/cl_SF_fceil.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" /* For inline version of minusp */ -#include "cl_inline.h" -#include "cl_SF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" namespace cln { diff --git a/src/float/sfloat/division/cl_SF_ffloor.cc b/src/float/sfloat/division/cl_SF_ffloor.cc index af517cb..cbfbf80 100644 --- a/src/float/sfloat/division/cl_SF_ffloor.cc +++ b/src/float/sfloat/division/cl_SF_ffloor.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" /* For inline version of minusp */ -#include "cl_inline.h" -#include "cl_SF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" namespace cln { diff --git a/src/float/sfloat/division/cl_SF_floor22.cc b/src/float/sfloat/division/cl_SF_floor22.cc index af4c765..fd7e105 100644 --- a/src/float/sfloat/division/cl_SF_floor22.cc +++ b/src/float/sfloat/division/cl_SF_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/division/cl_SF_recip.cc b/src/float/sfloat/division/cl_SF_recip.cc index 23f62f8..4d25737 100644 --- a/src/float/sfloat/division/cl_SF_recip.cc +++ b/src/float/sfloat/division/cl_SF_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/division/cl_SF_round22.cc b/src/float/sfloat/division/cl_SF_round22.cc index d9fde3f..50f9ffc 100644 --- a/src/float/sfloat/division/cl_SF_round22.cc +++ b/src/float/sfloat/division/cl_SF_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/division/cl_SF_trunc22.cc b/src/float/sfloat/division/cl_SF_trunc22.cc index 8fd7368..e1f4923 100644 --- a/src/float/sfloat/division/cl_SF_trunc22.cc +++ b/src/float/sfloat/division/cl_SF_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/elem/Makeflags b/src/float/sfloat/elem/Makeflags deleted file mode 100644 index ddfbd55..0000000 --- a/src/float/sfloat/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/sfloat/elem/cl_SF_compare.cc b/src/float/sfloat/elem/cl_SF_compare.cc index c31e18c..738f3ec 100644 --- a/src/float/sfloat/elem/cl_SF_compare.cc +++ b/src/float/sfloat/elem/cl_SF_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_inline.h" -#include "cl_SF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_div.cc b/src/float/sfloat/elem/cl_SF_div.cc index 2c8458b..406a40e 100644 --- a/src/float/sfloat/elem/cl_SF_div.cc +++ b/src/float/sfloat/elem/cl_SF_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_SF.h" -#include "cl_N.h" -#include "cl_low.h" +#include "float/sfloat/cl_SF.h" +#include "base/cl_N.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_from_I.cc b/src/float/sfloat/elem/cl_SF_from_I.cc index c6787ee..5e77830 100644 --- a/src/float/sfloat/elem/cl_SF_from_I.cc +++ b/src/float/sfloat/elem/cl_SF_from_I.cc @@ -1,17 +1,17 @@ // cl_I_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_from_RA.cc b/src/float/sfloat/elem/cl_SF_from_RA.cc index 71cb5b5..8d2ed02 100644 --- a/src/float/sfloat/elem/cl_SF_from_RA.cc +++ b/src/float/sfloat/elem/cl_SF_from_RA.cc @@ -1,17 +1,17 @@ // cl_RA_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_fround.cc b/src/float/sfloat/elem/cl_SF_fround.cc index a52d0ab..da40451 100644 --- a/src/float/sfloat/elem/cl_SF_fround.cc +++ b/src/float/sfloat/elem/cl_SF_fround.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_ftrunc.cc b/src/float/sfloat/elem/cl_SF_ftrunc.cc index edc9579..70e762c 100644 --- a/src/float/sfloat/elem/cl_SF_ftrunc.cc +++ b/src/float/sfloat/elem/cl_SF_ftrunc.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_futrunc.cc b/src/float/sfloat/elem/cl_SF_futrunc.cc index 7dc3522..0a422a0 100644 --- a/src/float/sfloat/elem/cl_SF_futrunc.cc +++ b/src/float/sfloat/elem/cl_SF_futrunc.cc @@ -1,10 +1,10 @@ // futruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" // Implementation. diff --git a/src/float/sfloat/elem/cl_SF_minus.cc b/src/float/sfloat/elem/cl_SF_minus.cc index 5f6bfcf..56029c4 100644 --- a/src/float/sfloat/elem/cl_SF_minus.cc +++ b/src/float/sfloat/elem/cl_SF_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" /* Use inline version of zerop */ -#include "cl_inline.h" -#include "cl_SF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_zerop.cc" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_minusp.cc b/src/float/sfloat/elem/cl_SF_minusp.cc index 269c9f8..c83e93a 100644 --- a/src/float/sfloat/elem/cl_SF_minusp.cc +++ b/src/float/sfloat/elem/cl_SF_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_mul.cc b/src/float/sfloat/elem/cl_SF_mul.cc index 642b05d..00a36fe 100644 --- a/src/float/sfloat/elem/cl_SF_mul.cc +++ b/src/float/sfloat/elem/cl_SF_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_low.h" +#include "float/sfloat/cl_SF.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_plus.cc b/src/float/sfloat/elem/cl_SF_plus.cc index 80a319b..8fdb2de 100644 --- a/src/float/sfloat/elem/cl_SF_plus.cc +++ b/src/float/sfloat/elem/cl_SF_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_xmacros.h" +#include "float/sfloat/cl_SF.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_plusp.cc b/src/float/sfloat/elem/cl_SF_plusp.cc index e0e733b..a621ca8 100644 --- a/src/float/sfloat/elem/cl_SF_plusp.cc +++ b/src/float/sfloat/elem/cl_SF_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" /* For inline versions of minusp and zerop */ -#include "cl_inline.h" -#include "cl_SF_minusp.cc" -#include "cl_SF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" +#include "float/sfloat/elem/cl_SF_zerop.cc" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_scale.cc b/src/float/sfloat/elem/cl_SF_scale.cc index a42891b..c5fb383 100644 --- a/src/float/sfloat/elem/cl_SF_scale.cc +++ b/src/float/sfloat/elem/cl_SF_scale.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_scale_I.cc b/src/float/sfloat/elem/cl_SF_scale_I.cc index d8011b8..937f5dd 100644 --- a/src/float/sfloat/elem/cl_SF_scale_I.cc +++ b/src/float/sfloat/elem/cl_SF_scale_I.cc @@ -1,7 +1,7 @@ // scale_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_SF.h" -#include "cl_F.h" -#include "cl_I.h" +#include "float/sfloat/cl_SF.h" +#include "float/cl_F.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_to_I.cc b/src/float/sfloat/elem/cl_SF_to_I.cc index 0483029..ab4213b 100644 --- a/src/float/sfloat/elem/cl_SF_to_I.cc +++ b/src/float/sfloat/elem/cl_SF_to_I.cc @@ -1,16 +1,16 @@ // cl_SF_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_uminus.cc b/src/float/sfloat/elem/cl_SF_uminus.cc index 49b4129..3ab5c08 100644 --- a/src/float/sfloat/elem/cl_SF_uminus.cc +++ b/src/float/sfloat/elem/cl_SF_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" -#include "cl_inline.h" -#include "cl_SF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_zerop.cc" namespace cln { diff --git a/src/float/sfloat/elem/cl_SF_zerop.cc b/src/float/sfloat/elem/cl_SF_zerop.cc index e729318..7b6e112 100644 --- a/src/float/sfloat/elem/cl_SF_zerop.cc +++ b/src/float/sfloat/elem/cl_SF_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/input/Makeflags b/src/float/sfloat/input/Makeflags deleted file mode 100644 index 25e2d20..0000000 --- a/src/float/sfloat/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += diff --git a/src/float/sfloat/input/cl_SF_from_string.cc b/src/float/sfloat/input/cl_SF_from_string.cc index e223b4c..9e6aaba 100644 --- a/src/float/sfloat/input/cl_SF_from_string.cc +++ b/src/float/sfloat/input/cl_SF_from_string.cc @@ -1,7 +1,7 @@ // cl_SF (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat_class.h" diff --git a/src/float/sfloat/misc/Makeflags b/src/float/sfloat/misc/Makeflags deleted file mode 100644 index b08ce04..0000000 --- a/src/float/sfloat/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/sfloat/misc/cl_SF_abs.cc b/src/float/sfloat/misc/cl_SF_abs.cc index bba1d61..b497b6d 100644 --- a/src/float/sfloat/misc/cl_SF_abs.cc +++ b/src/float/sfloat/misc/cl_SF_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_inline.h" -#include "cl_SF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_as.cc b/src/float/sfloat/misc/cl_SF_as.cc index 2976ddb..b2108f3 100644 --- a/src/float/sfloat/misc/cl_SF_as.cc +++ b/src/float/sfloat/misc/cl_SF_as.cc @@ -1,7 +1,7 @@ // cl_SF_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_class.cc b/src/float/sfloat/misc/cl_SF_class.cc index a4db7ba..587290c 100644 --- a/src/float/sfloat/misc/cl_SF_class.cc +++ b/src/float/sfloat/misc/cl_SF_class.cc @@ -1,7 +1,7 @@ // cl_class_sfloat. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" diff --git a/src/float/sfloat/misc/cl_SF_debug.cc b/src/float/sfloat/misc/cl_SF_debug.cc index c7b4531..96b1333 100644 --- a/src/float/sfloat/misc/cl_SF_debug.cc +++ b/src/float/sfloat/misc/cl_SF_debug.cc @@ -1,7 +1,7 @@ // cl_SF debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/float/sfloat/misc/cl_SF_decode.cc b/src/float/sfloat/misc/cl_SF_decode.cc index ea0004a..d3901ac 100644 --- a/src/float/sfloat/misc/cl_SF_decode.cc +++ b/src/float/sfloat/misc/cl_SF_decode.cc @@ -1,7 +1,7 @@ // decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_I.h" +#include "float/sfloat/cl_SF.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_digits.cc b/src/float/sfloat/misc/cl_SF_digits.cc index 146ed89..4501f42 100644 --- a/src/float/sfloat/misc/cl_SF_digits.cc +++ b/src/float/sfloat/misc/cl_SF_digits.cc @@ -1,7 +1,7 @@ // float_digits(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_eqhashcode.cc b/src/float/sfloat/misc/cl_SF_eqhashcode.cc index cb6c231..c671e05 100644 --- a/src/float/sfloat/misc/cl_SF_eqhashcode.cc +++ b/src/float/sfloat/misc/cl_SF_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_SF equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_N.h" -#include "cl_SF.h" +#include "base/cl_N.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_exponent.cc b/src/float/sfloat/misc/cl_SF_exponent.cc index 37270c8..12d04c5 100644 --- a/src/float/sfloat/misc/cl_SF_exponent.cc +++ b/src/float/sfloat/misc/cl_SF_exponent.cc @@ -1,7 +1,7 @@ // float_exponent(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_idecode.cc b/src/float/sfloat/misc/cl_SF_idecode.cc index d07949e..e322d46 100644 --- a/src/float/sfloat/misc/cl_SF_idecode.cc +++ b/src/float/sfloat/misc/cl_SF_idecode.cc @@ -1,7 +1,7 @@ // integer_decode_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_SF.h" -#include "cl_I.h" +#include "float/sfloat/cl_SF.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_max.cc b/src/float/sfloat/misc/cl_SF_max.cc index 4e2d5b7..90fe128 100644 --- a/src/float/sfloat/misc/cl_SF_max.cc +++ b/src/float/sfloat/misc/cl_SF_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" diff --git a/src/float/sfloat/misc/cl_SF_min.cc b/src/float/sfloat/misc/cl_SF_min.cc index 3ea089c..acb7c5a 100644 --- a/src/float/sfloat/misc/cl_SF_min.cc +++ b/src/float/sfloat/misc/cl_SF_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" diff --git a/src/float/sfloat/misc/cl_SF_precision.cc b/src/float/sfloat/misc/cl_SF_precision.cc index f8bd982..99ebf0d 100644 --- a/src/float/sfloat/misc/cl_SF_precision.cc +++ b/src/float/sfloat/misc/cl_SF_precision.cc @@ -1,7 +1,7 @@ // float_precision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" -#include "cl_inline.h" -#include "cl_SF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_zerop.cc" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_sign.cc b/src/float/sfloat/misc/cl_SF_sign.cc index 35f3d8f..e524747 100644 --- a/src/float/sfloat/misc/cl_SF_sign.cc +++ b/src/float/sfloat/misc/cl_SF_sign.cc @@ -1,7 +1,7 @@ // float_sign(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" -#include "cl_inline.h" -#include "cl_SF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" namespace cln { diff --git a/src/float/sfloat/misc/cl_SF_signum.cc b/src/float/sfloat/misc/cl_SF_signum.cc index ac75daa..5a75af0 100644 --- a/src/float/sfloat/misc/cl_SF_signum.cc +++ b/src/float/sfloat/misc/cl_SF_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/sfloat.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" /* Use inline versions of minusp and zerop */ -#include "cl_inline.h" -#include "cl_SF_minusp.cc" -#include "cl_SF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" +#include "float/sfloat/elem/cl_SF_zerop.cc" namespace cln { diff --git a/src/float/transcendental/Makeflags b/src/float/transcendental/Makeflags deleted file mode 100644 index db8904b..0000000 --- a/src/float/transcendental/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/float/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/lfloat/elem -I$(srcdir)/float/lfloat/misc diff --git a/src/float/transcendental/cl_F_atanhx.cc b/src/float/transcendental/cl_F_atanhx.cc index c2f0475..cd9536b 100644 --- a/src/float/transcendental/cl_F_atanhx.cc +++ b/src/float/transcendental/cl_F_atanhx.cc @@ -1,24 +1,24 @@ // atanhx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" // Implementation. #include "cln/float.h" -#include "cl_low.h" +#include "base/cl_low.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" -#include "cl_LF_minusp.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" +#include "float/lfloat/elem/cl_LF_minusp.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_atanx.cc b/src/float/transcendental/cl_F_atanx.cc index 5319a4f..600af96 100644 --- a/src/float/transcendental/cl_F_atanx.cc +++ b/src/float/transcendental/cl_F_atanx.cc @@ -1,25 +1,25 @@ // atanx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/float.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" -#include "cl_LF_minusp.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" +#include "float/lfloat/elem/cl_LF_minusp.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_catalanconst.cc b/src/float/transcendental/cl_F_catalanconst.cc index 63ff307..f70b7c3 100644 --- a/src/float/transcendental/cl_F_catalanconst.cc +++ b/src/float/transcendental/cl_F_catalanconst.cc @@ -1,7 +1,7 @@ // catalanconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_catalanconst_def.cc b/src/float/transcendental/cl_F_catalanconst_def.cc index 6e45a3b..f6bffa2 100644 --- a/src/float/transcendental/cl_F_catalanconst_def.cc +++ b/src/float/transcendental/cl_F_catalanconst_def.cc @@ -1,7 +1,7 @@ // catalanconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_catalanconst_f.cc b/src/float/transcendental/cl_F_catalanconst_f.cc index c23811d..1d78d04 100644 --- a/src/float/transcendental/cl_F_catalanconst_f.cc +++ b/src/float/transcendental/cl_F_catalanconst_f.cc @@ -1,7 +1,7 @@ // catalanconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_catalanconst_var.cc b/src/float/transcendental/cl_F_catalanconst_var.cc index 829f269..04d6966 100644 --- a/src/float/transcendental/cl_F_catalanconst_var.cc +++ b/src/float/transcendental/cl_F_catalanconst_var.cc @@ -1,18 +1,18 @@ // cl_F_catalanconst. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_DS.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "base/digitseq/cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_cos.cc b/src/float/transcendental/cl_F_cos.cc index 7c04470..c19ce46 100644 --- a/src/float/transcendental/cl_F_cos.cc +++ b/src/float/transcendental/cl_F_cos.cc @@ -1,7 +1,7 @@ // cos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/integer.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_cosh.cc b/src/float/transcendental/cl_F_cosh.cc index 2d79b89..620a0f4 100644 --- a/src/float/transcendental/cl_F_cosh.cc +++ b/src/float/transcendental/cl_F_cosh.cc @@ -1,7 +1,7 @@ // cosh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_coshsinh.cc b/src/float/transcendental/cl_F_coshsinh.cc index a23b756..578d279 100644 --- a/src/float/transcendental/cl_F_coshsinh.cc +++ b/src/float/transcendental/cl_F_coshsinh.cc @@ -1,7 +1,7 @@ // cosh_sinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_cossin.cc b/src/float/transcendental/cl_F_cossin.cc index 2734ae1..1d7f87e 100644 --- a/src/float/transcendental/cl_F_cossin.cc +++ b/src/float/transcendental/cl_F_cossin.cc @@ -1,7 +1,7 @@ // cos_sin(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/integer.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_eulerconst.cc b/src/float/transcendental/cl_F_eulerconst.cc index 1d393f8..f800ce5 100644 --- a/src/float/transcendental/cl_F_eulerconst.cc +++ b/src/float/transcendental/cl_F_eulerconst.cc @@ -1,7 +1,7 @@ // eulerconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_eulerconst_def.cc b/src/float/transcendental/cl_F_eulerconst_def.cc index 777924f..bd18bd8 100644 --- a/src/float/transcendental/cl_F_eulerconst_def.cc +++ b/src/float/transcendental/cl_F_eulerconst_def.cc @@ -1,7 +1,7 @@ // eulerconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_eulerconst_f.cc b/src/float/transcendental/cl_F_eulerconst_f.cc index e4e445c..47adcf0 100644 --- a/src/float/transcendental/cl_F_eulerconst_f.cc +++ b/src/float/transcendental/cl_F_eulerconst_f.cc @@ -1,7 +1,7 @@ // eulerconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_eulerconst_var.cc b/src/float/transcendental/cl_F_eulerconst_var.cc index b633955..dbad0ac 100644 --- a/src/float/transcendental/cl_F_eulerconst_var.cc +++ b/src/float/transcendental/cl_F_eulerconst_var.cc @@ -1,18 +1,18 @@ // cl_F_eulerconst. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_DS.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "base/digitseq/cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_exp.cc b/src/float/transcendental/cl_F_exp.cc index a07e338..54f2ca1 100644 --- a/src/float/transcendental/cl_F_exp.cc +++ b/src/float/transcendental/cl_F_exp.cc @@ -1,7 +1,7 @@ // exp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,15 +9,15 @@ // Implementation. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" #include "cln/float.h" -#include "cl_F.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" -#include "cl_inline.h" -#include "cl_LF_minusp.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_minusp.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_exp1.cc b/src/float/transcendental/cl_F_exp1.cc index 08ef3d7..a765dff 100644 --- a/src/float/transcendental/cl_F_exp1.cc +++ b/src/float/transcendental/cl_F_exp1.cc @@ -1,7 +1,7 @@ // exp1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" -#include "cl_LF.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_exp1_def.cc b/src/float/transcendental/cl_F_exp1_def.cc index cc50f69..da060cd 100644 --- a/src/float/transcendental/cl_F_exp1_def.cc +++ b/src/float/transcendental/cl_F_exp1_def.cc @@ -1,7 +1,7 @@ // exp1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_exp1_f.cc b/src/float/transcendental/cl_F_exp1_f.cc index aa8c451..14469f3 100644 --- a/src/float/transcendental/cl_F_exp1_f.cc +++ b/src/float/transcendental/cl_F_exp1_f.cc @@ -1,7 +1,7 @@ // exp1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_exp1_var.cc b/src/float/transcendental/cl_F_exp1_var.cc index e9b91b3..da1283d 100644 --- a/src/float/transcendental/cl_F_exp1_var.cc +++ b/src/float/transcendental/cl_F_exp1_var.cc @@ -1,18 +1,18 @@ // cl_F_exp1. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_DS.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "base/digitseq/cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_expx.cc b/src/float/transcendental/cl_F_expx.cc index 19517cd..132867d 100644 --- a/src/float/transcendental/cl_F_expx.cc +++ b/src/float/transcendental/cl_F_expx.cc @@ -1,24 +1,24 @@ // expx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/float.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_ln.cc b/src/float/transcendental/cl_F_ln.cc index 56e9beb..0f4ef4e 100644 --- a/src/float/transcendental/cl_F_ln.cc +++ b/src/float/transcendental/cl_F_ln.cc @@ -1,7 +1,7 @@ // ln(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" -#include "cl_SF.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" #include "cln/integer.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_ln10.cc b/src/float/transcendental/cl_F_ln10.cc index b3d581e..738c4ed 100644 --- a/src/float/transcendental/cl_F_ln10.cc +++ b/src/float/transcendental/cl_F_ln10.cc @@ -1,16 +1,16 @@ // cl_ln10(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_F.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_ln10_f.cc b/src/float/transcendental/cl_F_ln10_f.cc index 74aa5ce..4530ac7 100644 --- a/src/float/transcendental/cl_F_ln10_f.cc +++ b/src/float/transcendental/cl_F_ln10_f.cc @@ -1,15 +1,15 @@ // cl_ln10(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_ln10_var.cc b/src/float/transcendental/cl_F_ln10_var.cc index 4cc443d..579a7ef 100644 --- a/src/float/transcendental/cl_F_ln10_var.cc +++ b/src/float/transcendental/cl_F_ln10_var.cc @@ -1,18 +1,18 @@ // cl_F_ln10. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_DS.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "base/digitseq/cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_ln2.cc b/src/float/transcendental/cl_F_ln2.cc index 863a751..9593aa9 100644 --- a/src/float/transcendental/cl_F_ln2.cc +++ b/src/float/transcendental/cl_F_ln2.cc @@ -1,16 +1,16 @@ // cl_ln2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_F.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_ln2_f.cc b/src/float/transcendental/cl_F_ln2_f.cc index 739acb4..f1fadf8 100644 --- a/src/float/transcendental/cl_F_ln2_f.cc +++ b/src/float/transcendental/cl_F_ln2_f.cc @@ -1,15 +1,15 @@ // cl_ln2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_ln2_var.cc b/src/float/transcendental/cl_F_ln2_var.cc index aa920d6..1cb485e 100644 --- a/src/float/transcendental/cl_F_ln2_var.cc +++ b/src/float/transcendental/cl_F_ln2_var.cc @@ -1,18 +1,18 @@ // cl_F_ln2. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_DS.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "base/digitseq/cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_lnx.cc b/src/float/transcendental/cl_F_lnx.cc index ffa1780..68e5e0d 100644 --- a/src/float/transcendental/cl_F_lnx.cc +++ b/src/float/transcendental/cl_F_lnx.cc @@ -1,25 +1,25 @@ // lnx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/float.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" -#include "cl_LF_minusp.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" +#include "float/lfloat/elem/cl_LF_minusp.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_pi.cc b/src/float/transcendental/cl_F_pi.cc index 7d2f8ce..0197724 100644 --- a/src/float/transcendental/cl_F_pi.cc +++ b/src/float/transcendental/cl_F_pi.cc @@ -1,7 +1,7 @@ // pi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_pi_def.cc b/src/float/transcendental/cl_F_pi_def.cc index d2f6568..4d897fe 100644 --- a/src/float/transcendental/cl_F_pi_def.cc +++ b/src/float/transcendental/cl_F_pi_def.cc @@ -1,7 +1,7 @@ // pi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_pi_f.cc b/src/float/transcendental/cl_F_pi_f.cc index a94d8f2..c450140 100644 --- a/src/float/transcendental/cl_F_pi_f.cc +++ b/src/float/transcendental/cl_F_pi_f.cc @@ -1,7 +1,7 @@ // pi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" namespace cln { diff --git a/src/float/transcendental/cl_F_pi_var.cc b/src/float/transcendental/cl_F_pi_var.cc index 567a94a..1dacd42 100644 --- a/src/float/transcendental/cl_F_pi_var.cc +++ b/src/float/transcendental/cl_F_pi_var.cc @@ -1,19 +1,19 @@ // cl_SF_pi(), cl_FF_pi(), cl_DF_pi(), cl_LF_pi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. -#include "cl_DS.h" -#include "cl_LF.h" -#include "cl_LF_impl.h" -#include "cl_F.h" +#include "base/digitseq/cl_DS.h" +#include "float/lfloat/cl_LF.h" +#include "float/lfloat/cl_LF_impl.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/float/transcendental/cl_F_roundpi.cc b/src/float/transcendental/cl_F_roundpi.cc index 71e535a..d83c7a2 100644 --- a/src/float/transcendental/cl_F_roundpi.cc +++ b/src/float/transcendental/cl_F_roundpi.cc @@ -1,10 +1,10 @@ // cl_round_pi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. diff --git a/src/float/transcendental/cl_F_roundpi2.cc b/src/float/transcendental/cl_F_roundpi2.cc index 0e20c19..d692c5d 100644 --- a/src/float/transcendental/cl_F_roundpi2.cc +++ b/src/float/transcendental/cl_F_roundpi2.cc @@ -1,10 +1,10 @@ // cl_round_pi2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. diff --git a/src/float/transcendental/cl_F_sin.cc b/src/float/transcendental/cl_F_sin.cc index 3b0d33e..be05425 100644 --- a/src/float/transcendental/cl_F_sin.cc +++ b/src/float/transcendental/cl_F_sin.cc @@ -1,7 +1,7 @@ // sin(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,11 +9,11 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/integer.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_sinh.cc b/src/float/transcendental/cl_F_sinh.cc index a490271..9800e28 100644 --- a/src/float/transcendental/cl_F_sinh.cc +++ b/src/float/transcendental/cl_F_sinh.cc @@ -1,7 +1,7 @@ // sinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_F_tran.h" -#include "cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_sinhx.cc b/src/float/transcendental/cl_F_sinhx.cc index 820049f..71bed67 100644 --- a/src/float/transcendental/cl_F_sinhx.cc +++ b/src/float/transcendental/cl_F_sinhx.cc @@ -1,24 +1,24 @@ // sinhxbyx(), sinhx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/float.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_sinx.cc b/src/float/transcendental/cl_F_sinx.cc index 3f40c74..c3dc753 100644 --- a/src/float/transcendental/cl_F_sinx.cc +++ b/src/float/transcendental/cl_F_sinx.cc @@ -1,24 +1,24 @@ // sinxbyx(), sinx(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/float.h" -#include "cl_low.h" -#include "cl_F.h" +#include "base/cl_low.h" +#include "float/cl_F.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_inline.h" -#include "cl_LF_zerop.cc" -#include "cl_LF_exponent.cc" +#include "base/cl_inline.h" +#include "float/lfloat/elem/cl_LF_zerop.cc" +#include "float/lfloat/misc/cl_LF_exponent.cc" namespace cln { diff --git a/src/float/transcendental/cl_F_tan.cc b/src/float/transcendental/cl_F_tan.cc index fb4c6c5..0c1213f 100644 --- a/src/float/transcendental/cl_F_tan.cc +++ b/src/float/transcendental/cl_F_tan.cc @@ -1,7 +1,7 @@ // tan(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" diff --git a/src/float/transcendental/cl_F_tanh.cc b/src/float/transcendental/cl_F_tanh.cc index fe6a3b0..a6b967b 100644 --- a/src/float/transcendental/cl_F_tanh.cc +++ b/src/float/transcendental/cl_F_tanh.cc @@ -1,7 +1,7 @@ // tanh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" diff --git a/src/float/transcendental/cl_F_zeta_int.cc b/src/float/transcendental/cl_F_zeta_int.cc index 4f993e5..3f8a711 100644 --- a/src/float/transcendental/cl_F_zeta_int.cc +++ b/src/float/transcendental/cl_F_zeta_int.cc @@ -1,7 +1,7 @@ // zeta(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_zeta_int_def.cc b/src/float/transcendental/cl_F_zeta_int_def.cc index b4210cf..5a788ed 100644 --- a/src/float/transcendental/cl_F_zeta_int_def.cc +++ b/src/float/transcendental/cl_F_zeta_int_def.cc @@ -1,7 +1,7 @@ // zeta(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_F_zeta_int_f.cc b/src/float/transcendental/cl_F_zeta_int_f.cc index 7fd1b55..44a9a63 100644 --- a/src/float/transcendental/cl_F_zeta_int_f.cc +++ b/src/float/transcendental/cl_F_zeta_int_f.cc @@ -1,7 +1,7 @@ // zeta(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/float.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_F.h" -#include "cl_F_tran.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/transcendental/cl_F_tran.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_atan_recip.cc b/src/float/transcendental/cl_LF_atan_recip.cc index 2b87d53..48b79c9 100644 --- a/src/float/transcendental/cl_LF_atan_recip.cc +++ b/src/float/transcendental/cl_LF_atan_recip.cc @@ -1,18 +1,18 @@ // cl_atan_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/integer.h" #include "cln/lfloat.h" -#include "cl_LF.h" -#include "cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" #undef floor #include diff --git a/src/float/transcendental/cl_LF_atanh_recip.cc b/src/float/transcendental/cl_LF_atanh_recip.cc index 84b4092..f88b0a4 100644 --- a/src/float/transcendental/cl_LF_atanh_recip.cc +++ b/src/float/transcendental/cl_LF_atanh_recip.cc @@ -1,18 +1,18 @@ // cl_atanh_recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/integer.h" #include "cln/lfloat.h" -#include "cl_LF.h" -#include "cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" #undef floor #include diff --git a/src/float/transcendental/cl_LF_catalanconst.cc b/src/float/transcendental/cl_LF_catalanconst.cc index 9e742c2..a68219b 100644 --- a/src/float/transcendental/cl_LF_catalanconst.cc +++ b/src/float/transcendental/cl_LF_catalanconst.cc @@ -1,19 +1,19 @@ // catalanconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_coshsinh.cc b/src/float/transcendental/cl_LF_coshsinh.cc index 9d8c489..2e89ded 100644 --- a/src/float/transcendental/cl_LF_coshsinh.cc +++ b/src/float/transcendental/cl_LF_coshsinh.cc @@ -1,16 +1,16 @@ // cl_coshsinh_ratseries(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_coshsinh_aux.cc b/src/float/transcendental/cl_LF_coshsinh_aux.cc index fab71c5..0612b2c 100644 --- a/src/float/transcendental/cl_LF_coshsinh_aux.cc +++ b/src/float/transcendental/cl_LF_coshsinh_aux.cc @@ -1,19 +1,19 @@ // cl_coshsinh_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" #include "cln/exception.h" #undef floor diff --git a/src/float/transcendental/cl_LF_cossin.cc b/src/float/transcendental/cl_LF_cossin.cc index 2c4244c..84be06e 100644 --- a/src/float/transcendental/cl_LF_cossin.cc +++ b/src/float/transcendental/cl_LF_cossin.cc @@ -1,16 +1,16 @@ // cl_cossin_ratseries(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_cossin_aux.cc b/src/float/transcendental/cl_LF_cossin_aux.cc index 793bdcf..74977f2 100644 --- a/src/float/transcendental/cl_LF_cossin_aux.cc +++ b/src/float/transcendental/cl_LF_cossin_aux.cc @@ -1,19 +1,19 @@ // cl_cossin_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" #include "cln/exception.h" #undef floor diff --git a/src/float/transcendental/cl_LF_eulerconst.cc b/src/float/transcendental/cl_LF_eulerconst.cc index 998b4b5..c5965af 100644 --- a/src/float/transcendental/cl_LF_eulerconst.cc +++ b/src/float/transcendental/cl_LF_eulerconst.cc @@ -1,20 +1,20 @@ // eulerconst(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" #include "cln/real.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_exp1.cc b/src/float/transcendental/cl_LF_exp1.cc index 70f79cc..c1f1ace 100644 --- a/src/float/transcendental/cl_LF_exp1.cc +++ b/src/float/transcendental/cl_LF_exp1.cc @@ -1,17 +1,17 @@ // exp1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" #undef floor diff --git a/src/float/transcendental/cl_LF_exp_aux.cc b/src/float/transcendental/cl_LF_exp_aux.cc index bc25233..408b50e 100644 --- a/src/float/transcendental/cl_LF_exp_aux.cc +++ b/src/float/transcendental/cl_LF_exp_aux.cc @@ -1,17 +1,17 @@ // cl_exp_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" #include "cln/exception.h" diff --git a/src/float/transcendental/cl_LF_ln10.cc b/src/float/transcendental/cl_LF_ln10.cc index ddf25c2..97bb09c 100644 --- a/src/float/transcendental/cl_LF_ln10.cc +++ b/src/float/transcendental/cl_LF_ln10.cc @@ -1,16 +1,16 @@ // cl_ln10(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ln2.cc b/src/float/transcendental/cl_LF_ln2.cc index 99dd8a0..881ac72 100644 --- a/src/float/transcendental/cl_LF_ln2.cc +++ b/src/float/transcendental/cl_LF_ln2.cc @@ -1,16 +1,16 @@ // cl_ln2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_pi.cc b/src/float/transcendental/cl_LF_pi.cc index 78f625c..78e844e 100644 --- a/src/float/transcendental/cl_LF_pi.cc +++ b/src/float/transcendental/cl_LF_pi.cc @@ -1,19 +1,19 @@ // pi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_.cc b/src/float/transcendental/cl_LF_ratseries_.cc index be72ea3..b7c04fc 100644 --- a/src/float/transcendental/cl_LF_ratseries_.cc +++ b/src/float/transcendental/cl_LF_ratseries_.cc @@ -1,17 +1,17 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. #include "cln/lfloat.h" #include "cln/integer.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_a.cc b/src/float/transcendental/cl_LF_ratseries_a.cc index edbe3ce..a1ce57d 100644 --- a/src/float/transcendental/cl_LF_ratseries_a.cc +++ b/src/float/transcendental/cl_LF_ratseries_a.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_ab.cc b/src/float/transcendental/cl_LF_ratseries_ab.cc index ed48489..1fc389f 100644 --- a/src/float/transcendental/cl_LF_ratseries_ab.cc +++ b/src/float/transcendental/cl_LF_ratseries_ab.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_b.cc b/src/float/transcendental/cl_LF_ratseries_b.cc index 1c56864..f4b6bfa 100644 --- a/src/float/transcendental/cl_LF_ratseries_b.cc +++ b/src/float/transcendental/cl_LF_ratseries_b.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_p.cc b/src/float/transcendental/cl_LF_ratseries_p.cc index f2562d0..c374192 100644 --- a/src/float/transcendental/cl_LF_ratseries_p.cc +++ b/src/float/transcendental/cl_LF_ratseries_p.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pa.cc b/src/float/transcendental/cl_LF_ratseries_pa.cc index 196f580..40f34e5 100644 --- a/src/float/transcendental/cl_LF_ratseries_pa.cc +++ b/src/float/transcendental/cl_LF_ratseries_pa.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pab.cc b/src/float/transcendental/cl_LF_ratseries_pab.cc index 67a2b78..f584aca 100644 --- a/src/float/transcendental/cl_LF_ratseries_pab.cc +++ b/src/float/transcendental/cl_LF_ratseries_pab.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pb.cc b/src/float/transcendental/cl_LF_ratseries_pb.cc index 27abaab..fa7d0d5 100644 --- a/src/float/transcendental/cl_LF_ratseries_pb.cc +++ b/src/float/transcendental/cl_LF_ratseries_pb.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pq.cc b/src/float/transcendental/cl_LF_ratseries_pq.cc index 30907d2..b583fc6 100644 --- a/src/float/transcendental/cl_LF_ratseries_pq.cc +++ b/src/float/transcendental/cl_LF_ratseries_pq.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -13,8 +13,8 @@ #include "cln/integer.h" #include "cln/real.h" #include "cln/exception.h" -#include "cl_LF.h" -#include "cl_alloca.h" +#include "float/lfloat/cl_LF.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pqa.cc b/src/float/transcendental/cl_LF_ratseries_pqa.cc index a9e5877..ec8f631 100644 --- a/src/float/transcendental/cl_LF_ratseries_pqa.cc +++ b/src/float/transcendental/cl_LF_ratseries_pqa.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -13,8 +13,8 @@ #include "cln/integer.h" #include "cln/real.h" #include "cln/exception.h" -#include "cl_LF.h" -#include "cl_alloca.h" +#include "float/lfloat/cl_LF.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pqab.cc b/src/float/transcendental/cl_LF_ratseries_pqab.cc index ce41b45..ad097c5 100644 --- a/src/float/transcendental/cl_LF_ratseries_pqab.cc +++ b/src/float/transcendental/cl_LF_ratseries_pqab.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -13,8 +13,8 @@ #include "cln/integer.h" #include "cln/real.h" #include "cln/exception.h" -#include "cl_LF.h" -#include "cl_alloca.h" +#include "float/lfloat/cl_LF.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_pqb.cc b/src/float/transcendental/cl_LF_ratseries_pqb.cc index f14d460..7eab6c7 100644 --- a/src/float/transcendental/cl_LF_ratseries_pqb.cc +++ b/src/float/transcendental/cl_LF_ratseries_pqb.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -13,8 +13,8 @@ #include "cln/integer.h" #include "cln/real.h" #include "cln/exception.h" -#include "cl_LF.h" -#include "cl_alloca.h" +#include "float/lfloat/cl_LF.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_q.cc b/src/float/transcendental/cl_LF_ratseries_q.cc index b0beeaf..6f9818d 100644 --- a/src/float/transcendental/cl_LF_ratseries_q.cc +++ b/src/float/transcendental/cl_LF_ratseries_q.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_qa.cc b/src/float/transcendental/cl_LF_ratseries_qa.cc index e42ca3f..6289b9c 100644 --- a/src/float/transcendental/cl_LF_ratseries_qa.cc +++ b/src/float/transcendental/cl_LF_ratseries_qa.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_qab.cc b/src/float/transcendental/cl_LF_ratseries_qab.cc index 8d4e1a1..5908bcc 100644 --- a/src/float/transcendental/cl_LF_ratseries_qab.cc +++ b/src/float/transcendental/cl_LF_ratseries_qab.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratseries_qb.cc b/src/float/transcendental/cl_LF_ratseries_qb.cc index 10c79f9..62bfcbf 100644 --- a/src/float/transcendental/cl_LF_ratseries_qb.cc +++ b/src/float/transcendental/cl_LF_ratseries_qb.cc @@ -1,10 +1,10 @@ // eval_rational_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratsumseries_pqcd.cc b/src/float/transcendental/cl_LF_ratsumseries_pqcd.cc index 68b93d4..2392fd7 100644 --- a/src/float/transcendental/cl_LF_ratsumseries_pqcd.cc +++ b/src/float/transcendental/cl_LF_ratsumseries_pqcd.cc @@ -1,10 +1,10 @@ // eval_pqcd_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/real.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratsumseries_pqcd_aux.cc b/src/float/transcendental/cl_LF_ratsumseries_pqcd_aux.cc index 91c0900..635d06d 100644 --- a/src/float/transcendental/cl_LF_ratsumseries_pqcd_aux.cc +++ b/src/float/transcendental/cl_LF_ratsumseries_pqcd_aux.cc @@ -1,10 +1,10 @@ // eval_pqcd_series_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. diff --git a/src/float/transcendental/cl_LF_ratsumseries_pqd.cc b/src/float/transcendental/cl_LF_ratsumseries_pqd.cc index a47db3a..d058b47 100644 --- a/src/float/transcendental/cl_LF_ratsumseries_pqd.cc +++ b/src/float/transcendental/cl_LF_ratsumseries_pqd.cc @@ -1,10 +1,10 @@ // eval_pqd_series(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. @@ -12,7 +12,7 @@ #include "cln/lfloat.h" #include "cln/integer.h" #include "cln/real.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_ratsumseries_pqd_aux.cc b/src/float/transcendental/cl_LF_ratsumseries_pqd_aux.cc index ed3e865..b5e8585 100644 --- a/src/float/transcendental/cl_LF_ratsumseries_pqd_aux.cc +++ b/src/float/transcendental/cl_LF_ratsumseries_pqd_aux.cc @@ -1,10 +1,10 @@ // eval_pqd_series_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_LF_tran.h" +#include "float/transcendental/cl_LF_tran.h" // Implementation. diff --git a/src/float/transcendental/cl_LF_tran.h b/src/float/transcendental/cl_LF_tran.h index d5e902e..ecce8bc 100644 --- a/src/float/transcendental/cl_LF_tran.h +++ b/src/float/transcendental/cl_LF_tran.h @@ -6,7 +6,7 @@ #include "cln/integer.h" #include "cln/integer_ring.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_zeta3.cc b/src/float/transcendental/cl_LF_zeta3.cc index 0d71af1..78244dd 100644 --- a/src/float/transcendental/cl_LF_zeta3.cc +++ b/src/float/transcendental/cl_LF_zeta3.cc @@ -1,19 +1,19 @@ // zeta3(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/float/transcendental/cl_LF_zeta_int.cc b/src/float/transcendental/cl_LF_zeta_int.cc index 2101737..2e9828d 100644 --- a/src/float/transcendental/cl_LF_zeta_int.cc +++ b/src/float/transcendental/cl_LF_zeta_int.cc @@ -1,20 +1,20 @@ // zeta(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_F_tran.h" +#include "float/transcendental/cl_F_tran.h" // Implementation. #include "cln/lfloat.h" -#include "cl_LF_tran.h" -#include "cl_LF.h" +#include "float/transcendental/cl_LF_tran.h" +#include "float/lfloat/cl_LF.h" #include "cln/integer.h" #include "cln/exception.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" namespace cln { diff --git a/src/integer/2adic/Makeflags b/src/integer/2adic/Makeflags deleted file mode 100644 index c8d2dc9..0000000 --- a/src/integer/2adic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/integer/bitwise diff --git a/src/integer/2adic/cl_I_2adic_div.cc b/src/integer/2adic/cl_I_2adic_div.cc index 44cca87..cc5ff34 100644 --- a/src/integer/2adic/cl_I_2adic_div.cc +++ b/src/integer/2adic/cl_I_2adic_div.cc @@ -1,7 +1,7 @@ // cl_div2adic(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_DS.h" -#include "cl_2DS.h" -#include "cl_I_log.h" +#include "base/digitseq/cl_DS.h" +#include "base/digitseq/cl_2DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/2adic/cl_I_2adic_recip.cc b/src/integer/2adic/cl_I_2adic_recip.cc index 4ff9575..7597a9e 100644 --- a/src/integer/2adic/cl_I_2adic_recip.cc +++ b/src/integer/2adic/cl_I_2adic_recip.cc @@ -1,7 +1,7 @@ // cl_recip2adic(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_DS.h" -#include "cl_2DS.h" -#include "cl_I_log.h" +#include "base/digitseq/cl_DS.h" +#include "base/digitseq/cl_2DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/Makeflags b/src/integer/Makeflags deleted file mode 100644 index 2375994..0000000 --- a/src/integer/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/integer/algebraic/Makeflags b/src/integer/algebraic/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/algebraic/cl_I_rootp.cc b/src/integer/algebraic/cl_I_rootp.cc index 68c464b..eb6a443 100644 --- a/src/integer/algebraic/cl_I_rootp.cc +++ b/src/integer/algebraic/cl_I_rootp.cc @@ -1,7 +1,7 @@ // rootp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/algebraic/cl_I_rootp_I.cc b/src/integer/algebraic/cl_I_rootp_I.cc index dc79ea8..03cf595 100644 --- a/src/integer/algebraic/cl_I_rootp_I.cc +++ b/src/integer/algebraic/cl_I_rootp_I.cc @@ -1,7 +1,7 @@ // rootp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/algebraic/cl_I_rootp_aux.cc b/src/integer/algebraic/cl_I_rootp_aux.cc index 8b50c50..8863342 100644 --- a/src/integer/algebraic/cl_I_rootp_aux.cc +++ b/src/integer/algebraic/cl_I_rootp_aux.cc @@ -1,7 +1,7 @@ // cl_rootp_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_2D.h" -#include "cl_2DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/digit/cl_2D.h" +#include "base/digitseq/cl_2DS.h" namespace cln { diff --git a/src/integer/algebraic/cl_I_sqrt.cc b/src/integer/algebraic/cl_I_sqrt.cc index afec169..5357510 100644 --- a/src/integer/algebraic/cl_I_sqrt.cc +++ b/src/integer/algebraic/cl_I_sqrt.cc @@ -1,7 +1,7 @@ // isqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -13,8 +13,8 @@ #include "cln/io.h" #include "cln/integer_io.h" #include "cln/exception.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" #include namespace cln { diff --git a/src/integer/algebraic/cl_I_sqrtp.cc b/src/integer/algebraic/cl_I_sqrtp.cc index 4934240..c5fa1a3 100644 --- a/src/integer/algebraic/cl_I_sqrtp.cc +++ b/src/integer/algebraic/cl_I_sqrtp.cc @@ -1,7 +1,7 @@ // sqrtp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/Makeflags b/src/integer/bitwise/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/bitwise/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/bitwise/cl_I_ash.cc b/src/integer/bitwise/cl_I_ash.cc index 21e6850..ddaa570 100644 --- a/src/integer/bitwise/cl_I_ash.cc +++ b/src/integer/bitwise/cl_I_ash.cc @@ -1,7 +1,7 @@ // ash(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ash_I.cc b/src/integer/bitwise/cl_I_ash_I.cc index cef7d0d..6c11f47 100644 --- a/src/integer/bitwise/cl_I_ash_I.cc +++ b/src/integer/bitwise/cl_I_ash_I.cc @@ -1,7 +1,7 @@ // ash(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ash_exception.cc b/src/integer/bitwise/cl_I_ash_exception.cc index c5f00ac..55236a2 100644 --- a/src/integer/bitwise/cl_I_ash_exception.cc +++ b/src/integer/bitwise/cl_I_ash_exception.cc @@ -1,7 +1,7 @@ // ash_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/bitwise/cl_I_boole.cc b/src/integer/bitwise/cl_I_boole.cc index 48a08b6..8a5badc 100644 --- a/src/integer/bitwise/cl_I_boole.cc +++ b/src/integer/bitwise/cl_I_boole.cc @@ -1,7 +1,7 @@ // boole(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/bitwise/cl_I_dpb.cc b/src/integer/bitwise/cl_I_dpb.cc index 03dded7..bd3ebed 100644 --- a/src/integer/bitwise/cl_I_dpb.cc +++ b/src/integer/bitwise/cl_I_dpb.cc @@ -1,7 +1,7 @@ // dpb(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_dpf.cc b/src/integer/bitwise/cl_I_dpf.cc index 038fc13..9281f81 100644 --- a/src/integer/bitwise/cl_I_dpf.cc +++ b/src/integer/bitwise/cl_I_dpf.cc @@ -1,7 +1,7 @@ // deposit_field(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_fullbyte.cc b/src/integer/bitwise/cl_I_fullbyte.cc index 06cf65e..91c8ded 100644 --- a/src/integer/bitwise/cl_I_fullbyte.cc +++ b/src/integer/bitwise/cl_I_fullbyte.cc @@ -1,16 +1,16 @@ // cl_fullbyte(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_byte.h" +#include "integer/bitwise/cl_I_byte.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ilength.cc b/src/integer/bitwise/cl_I_ilength.cc index 19e2d80..3e1a209 100644 --- a/src/integer/bitwise/cl_I_ilength.cc +++ b/src/integer/bitwise/cl_I_ilength.cc @@ -1,7 +1,7 @@ // integer_length(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ldb.cc b/src/integer/bitwise/cl_I_ldb.cc index 43153c8..41a699a 100644 --- a/src/integer/bitwise/cl_I_ldb.cc +++ b/src/integer/bitwise/cl_I_ldb.cc @@ -1,7 +1,7 @@ // ldb(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_I_byte.h" +#include "integer/cl_I.h" +#include "integer/bitwise/cl_I_byte.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ldbtest.cc b/src/integer/bitwise/cl_I_ldbtest.cc index 5b01c31..2edfe4c 100644 --- a/src/integer/bitwise/cl_I_ldbtest.cc +++ b/src/integer/bitwise/cl_I_ldbtest.cc @@ -1,7 +1,7 @@ // ldb_test(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_I_byte.h" +#include "integer/cl_I.h" +#include "integer/bitwise/cl_I_byte.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ldbx.cc b/src/integer/bitwise/cl_I_ldbx.cc index 73bb142..5eafe11 100644 --- a/src/integer/bitwise/cl_I_ldbx.cc +++ b/src/integer/bitwise/cl_I_ldbx.cc @@ -1,17 +1,17 @@ // ldb_extract(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_byte.h" +#include "integer/bitwise/cl_I_byte.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_ldbxtest.cc b/src/integer/bitwise/cl_I_ldbxtest.cc index 1bbc571..54d4eaf 100644 --- a/src/integer/bitwise/cl_I_ldbxtest.cc +++ b/src/integer/bitwise/cl_I_ldbxtest.cc @@ -1,17 +1,17 @@ // ldb_extract_test(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_byte.h" +#include "integer/bitwise/cl_I_byte.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_log.h b/src/integer/bitwise/cl_I_log.h index f64ff1a..0a5db84 100644 --- a/src/integer/bitwise/cl_I_log.h +++ b/src/integer/bitwise/cl_I_log.h @@ -4,8 +4,8 @@ #define _CL_I_LOG_H #include "cln/number.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_log_aux.cc b/src/integer/bitwise/cl_I_log_aux.cc index c70128b..7bd6a53 100644 --- a/src/integer/bitwise/cl_I_log_aux.cc +++ b/src/integer/bitwise/cl_I_log_aux.cc @@ -1,16 +1,16 @@ // I_to_DS_n_aux(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_log.h" +#include "integer/bitwise/cl_I_log.h" // Implementation. #include "cln/number.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logand.cc b/src/integer/bitwise/cl_I_logand.cc index 99cf698..bcdb2be 100644 --- a/src/integer/bitwise/cl_I_logand.cc +++ b/src/integer/bitwise/cl_I_logand.cc @@ -1,7 +1,7 @@ // logand(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logandc2.cc b/src/integer/bitwise/cl_I_logandc2.cc index a07913f..d72be12 100644 --- a/src/integer/bitwise/cl_I_logandc2.cc +++ b/src/integer/bitwise/cl_I_logandc2.cc @@ -1,7 +1,7 @@ // logandc2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logbitp.cc b/src/integer/bitwise/cl_I_logbitp.cc index 6bfd4f7..2c08846 100644 --- a/src/integer/bitwise/cl_I_logbitp.cc +++ b/src/integer/bitwise/cl_I_logbitp.cc @@ -1,7 +1,7 @@ // logbitp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logbitp_I.cc b/src/integer/bitwise/cl_I_logbitp_I.cc index aab5c70..74e9e2e 100644 --- a/src/integer/bitwise/cl_I_logbitp_I.cc +++ b/src/integer/bitwise/cl_I_logbitp_I.cc @@ -1,7 +1,7 @@ // logbitp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" #include "cln/io.h" #include "cln/integer_io.h" #include "cln/exception.h" diff --git a/src/integer/bitwise/cl_I_logcount.cc b/src/integer/bitwise/cl_I_logcount.cc index 6480c1a..e2674da 100644 --- a/src/integer/bitwise/cl_I_logcount.cc +++ b/src/integer/bitwise/cl_I_logcount.cc @@ -1,7 +1,7 @@ // logcount(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_D.h" -#include "cl_low.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/digit/cl_D.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logeqv.cc b/src/integer/bitwise/cl_I_logeqv.cc index da50ef4..a292b43 100644 --- a/src/integer/bitwise/cl_I_logeqv.cc +++ b/src/integer/bitwise/cl_I_logeqv.cc @@ -1,7 +1,7 @@ // logeqv(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logior.cc b/src/integer/bitwise/cl_I_logior.cc index bccff4a..0a4afca 100644 --- a/src/integer/bitwise/cl_I_logior.cc +++ b/src/integer/bitwise/cl_I_logior.cc @@ -1,7 +1,7 @@ // logior(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_lognand.cc b/src/integer/bitwise/cl_I_lognand.cc index 6fecc9f..ac1b678 100644 --- a/src/integer/bitwise/cl_I_lognand.cc +++ b/src/integer/bitwise/cl_I_lognand.cc @@ -1,7 +1,7 @@ // lognand(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_lognor.cc b/src/integer/bitwise/cl_I_lognor.cc index 103dcf1..4ae0dbe 100644 --- a/src/integer/bitwise/cl_I_lognor.cc +++ b/src/integer/bitwise/cl_I_lognor.cc @@ -1,7 +1,7 @@ // lognor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_lognot.cc b/src/integer/bitwise/cl_I_lognot.cc index 7725133..1040106 100644 --- a/src/integer/bitwise/cl_I_lognot.cc +++ b/src/integer/bitwise/cl_I_lognot.cc @@ -1,7 +1,7 @@ // lognot(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logorc2.cc b/src/integer/bitwise/cl_I_logorc2.cc index ca7188f..993a4e1 100644 --- a/src/integer/bitwise/cl_I_logorc2.cc +++ b/src/integer/bitwise/cl_I_logorc2.cc @@ -1,7 +1,7 @@ // logorc2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logtest.cc b/src/integer/bitwise/cl_I_logtest.cc index 14e6b8f..cbff7e0 100644 --- a/src/integer/bitwise/cl_I_logtest.cc +++ b/src/integer/bitwise/cl_I_logtest.cc @@ -1,7 +1,7 @@ // logtest(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_logxor.cc b/src/integer/bitwise/cl_I_logxor.cc index fa9eb58..8f218c3 100644 --- a/src/integer/bitwise/cl_I_logxor.cc +++ b/src/integer/bitwise/cl_I_logxor.cc @@ -1,7 +1,7 @@ // logxor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_I_log.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "integer/bitwise/cl_I_log.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_mkf.cc b/src/integer/bitwise/cl_I_mkf.cc index d62585d..0e40c32 100644 --- a/src/integer/bitwise/cl_I_mkf.cc +++ b/src/integer/bitwise/cl_I_mkf.cc @@ -1,7 +1,7 @@ // mask_field(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_I_byte.h" +#include "integer/cl_I.h" +#include "integer/bitwise/cl_I_byte.h" namespace cln { diff --git a/src/integer/bitwise/cl_I_mkfx.cc b/src/integer/bitwise/cl_I_mkfx.cc index df069b2..fe1d79e 100644 --- a/src/integer/bitwise/cl_I_mkfx.cc +++ b/src/integer/bitwise/cl_I_mkfx.cc @@ -1,17 +1,17 @@ // mkf_extract(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_byte.h" +#include "integer/bitwise/cl_I_byte.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/cl_I.h b/src/integer/cl_I.h index e519e72..8c1c3d5 100644 --- a/src/integer/cl_I.h +++ b/src/integer/cl_I.h @@ -5,11 +5,11 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_macros.h" +#include "base/cl_macros.h" #include "cln/malloc.h" #include "cln/exception.h" -#include "cl_offsetof.h" -#include "cl_DS.h" +#include "base/cl_offsetof.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/Makeflags b/src/integer/conv/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/conv/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/conv/cl_I_cached_power.cc b/src/integer/conv/cl_I_cached_power.cc index 1571d2a..8fb235f 100644 --- a/src/integer/conv/cl_I_cached_power.cc +++ b/src/integer/conv/cl_I_cached_power.cc @@ -1,7 +1,7 @@ // cached_power(). // Specification. -#include "cl_I_cached_power.h" +#include "integer/conv/cl_I_cached_power.h" // Implementation. diff --git a/src/integer/conv/cl_I_cached_power.h b/src/integer/conv/cl_I_cached_power.h index 78324dc..6efc270 100644 --- a/src/integer/conv/cl_I_cached_power.h +++ b/src/integer/conv/cl_I_cached_power.h @@ -1,10 +1,10 @@ // cached_power(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. diff --git a/src/integer/conv/cl_I_digits_need.cc b/src/integer/conv/cl_I_digits_need.cc index 50ca374..6612931 100644 --- a/src/integer/conv/cl_I_digits_need.cc +++ b/src/integer/conv/cl_I_digits_need.cc @@ -1,10 +1,10 @@ // cl_digits_need(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. diff --git a/src/integer/conv/cl_I_from_DS.cc b/src/integer/conv/cl_I_from_DS.cc index 5cb054e..2bd5e5b 100644 --- a/src/integer/conv/cl_I_from_DS.cc +++ b/src/integer/conv/cl_I_from_DS.cc @@ -1,19 +1,19 @@ // DS_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. #include "cln/number.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_I_from_NDS.cc" +#include "base/cl_inline.h" +#include "integer/conv/cl_I_from_NDS.cc" namespace cln { diff --git a/src/integer/conv/cl_I_from_L.cc b/src/integer/conv/cl_I_from_L.cc index aae3808..efc6887 100644 --- a/src/integer/conv/cl_I_from_L.cc +++ b/src/integer/conv/cl_I_from_L.cc @@ -1,10 +1,10 @@ // L_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #if (cl_value_len < 32) -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_L2.cc b/src/integer/conv/cl_I_from_L2.cc index 26a7dee..be5a00d 100644 --- a/src/integer/conv/cl_I_from_L2.cc +++ b/src/integer/conv/cl_I_from_L2.cc @@ -1,10 +1,10 @@ // L2_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #if (cl_word_size < 64) -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_NDS.cc b/src/integer/conv/cl_I_from_NDS.cc index 6a5abf4..d7d7dcf 100644 --- a/src/integer/conv/cl_I_from_NDS.cc +++ b/src/integer/conv/cl_I_from_NDS.cc @@ -1,16 +1,16 @@ // NDS_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. #include "cln/number.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_NUDS.cc b/src/integer/conv/cl_I_from_NUDS.cc index 07be62a..90562ff 100644 --- a/src/integer/conv/cl_I_from_NUDS.cc +++ b/src/integer/conv/cl_I_from_NUDS.cc @@ -1,19 +1,19 @@ // NUDS_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. #include "cln/number.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_I_from_NDS.cc" +#include "base/cl_inline.h" +#include "integer/conv/cl_I_from_NDS.cc" namespace cln { diff --git a/src/integer/conv/cl_I_from_Q.cc b/src/integer/conv/cl_I_from_Q.cc index 4f7f1dd..47c879a 100644 --- a/src/integer/conv/cl_I_from_Q.cc +++ b/src/integer/conv/cl_I_from_Q.cc @@ -1,10 +1,10 @@ // Q_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #ifdef intQsize -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_Q2.cc b/src/integer/conv/cl_I_from_Q2.cc index e75830e..fe7ca0e 100644 --- a/src/integer/conv/cl_I_from_Q2.cc +++ b/src/integer/conv/cl_I_from_Q2.cc @@ -1,10 +1,10 @@ // Q2_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #ifdef intQsize -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_UDS.cc b/src/integer/conv/cl_I_from_UDS.cc index 35cf061..8cb5b18 100644 --- a/src/integer/conv/cl_I_from_UDS.cc +++ b/src/integer/conv/cl_I_from_UDS.cc @@ -1,19 +1,19 @@ // UDS_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. #include "cln/number.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" -#include "cl_inline.h" -#include "cl_I_from_NDS.cc" +#include "base/cl_inline.h" +#include "integer/conv/cl_I_from_NDS.cc" namespace cln { diff --git a/src/integer/conv/cl_I_from_UL.cc b/src/integer/conv/cl_I_from_UL.cc index fe7e832..1671570 100644 --- a/src/integer/conv/cl_I_from_UL.cc +++ b/src/integer/conv/cl_I_from_UL.cc @@ -1,10 +1,10 @@ // UL_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #if (cl_value_len <= 32) -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_UL2.cc b/src/integer/conv/cl_I_from_UL2.cc index be8b420..3be44a1 100644 --- a/src/integer/conv/cl_I_from_UL2.cc +++ b/src/integer/conv/cl_I_from_UL2.cc @@ -1,10 +1,10 @@ // UL2_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #if (cl_word_size < 64) -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_UQ.cc b/src/integer/conv/cl_I_from_UQ.cc index fee98a3..d4b3091 100644 --- a/src/integer/conv/cl_I_from_UQ.cc +++ b/src/integer/conv/cl_I_from_UQ.cc @@ -1,10 +1,10 @@ // UQ_to_I() helper. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -13,7 +13,7 @@ #ifdef intQsize -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_from_digits.cc b/src/integer/conv/cl_I_from_digits.cc index 82fc71e..1046204 100644 --- a/src/integer/conv/cl_I_from_digits.cc +++ b/src/integer/conv/cl_I_from_digits.cc @@ -1,16 +1,16 @@ // digits_to_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. -#include "cl_DS.h" -#include "cl_I_cached_power.h" +#include "base/digitseq/cl_DS.h" +#include "integer/conv/cl_I_cached_power.h" namespace cln { diff --git a/src/integer/conv/cl_I_mul10plus.cc b/src/integer/conv/cl_I_mul10plus.cc index 5d282a7..eadcdbd 100644 --- a/src/integer/conv/cl_I_mul10plus.cc +++ b/src/integer/conv/cl_I_mul10plus.cc @@ -1,7 +1,7 @@ // mul_10_plus_x(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/conv/cl_I_to_L.cc b/src/integer/conv/cl_I_to_L.cc index e03fd67..d67e185 100644 --- a/src/integer/conv/cl_I_to_L.cc +++ b/src/integer/conv/cl_I_to_L.cc @@ -1,7 +1,7 @@ // cl_I_to_L(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/number.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" #include "cln/io.h" #include "cln/integer_io.h" #include "cln/exception.h" diff --git a/src/integer/conv/cl_I_to_Q.cc b/src/integer/conv/cl_I_to_Q.cc index 5e53086..2d3a6e0 100644 --- a/src/integer/conv/cl_I_to_Q.cc +++ b/src/integer/conv/cl_I_to_Q.cc @@ -1,10 +1,10 @@ // cl_I_to_Q(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -12,7 +12,7 @@ #ifdef intQsize #include "cln/number.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" #include "cln/io.h" #include "cln/integer_io.h" #include "cln/exception.h" diff --git a/src/integer/conv/cl_I_to_UL.cc b/src/integer/conv/cl_I_to_UL.cc index d64b2ea..b5d5706 100644 --- a/src/integer/conv/cl_I_to_UL.cc +++ b/src/integer/conv/cl_I_to_UL.cc @@ -1,7 +1,7 @@ // cl_I_to_UL(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/number.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" #include "cln/io.h" #include "cln/integer_io.h" #include "cln/exception.h" diff --git a/src/integer/conv/cl_I_to_UQ.cc b/src/integer/conv/cl_I_to_UQ.cc index 60b8dd3..8192a49 100644 --- a/src/integer/conv/cl_I_to_UQ.cc +++ b/src/integer/conv/cl_I_to_UQ.cc @@ -1,10 +1,10 @@ // cl_I_to_UQ(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. @@ -12,7 +12,7 @@ #ifdef intQsize #include "cln/number.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" #include "cln/io.h" #include "cln/integer_io.h" #include "cln/exception.h" diff --git a/src/integer/conv/cl_I_to_digits.cc b/src/integer/conv/cl_I_to_digits.cc index cd213c0..8774682 100644 --- a/src/integer/conv/cl_I_to_digits.cc +++ b/src/integer/conv/cl_I_to_digits.cc @@ -1,16 +1,16 @@ // UDS_to_digits(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. -#include "cl_DS.h" -#include "cl_I_cached_power.h" +#include "base/digitseq/cl_DS.h" +#include "integer/conv/cl_I_cached_power.h" namespace cln { diff --git a/src/integer/division/Makeflags b/src/integer/division/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/division/cl_I_ceil1.cc b/src/integer/division/cl_I_ceil1.cc index 4d8bd37..c2ff533 100644 --- a/src/integer/division/cl_I_ceil1.cc +++ b/src/integer/division/cl_I_ceil1.cc @@ -1,7 +1,7 @@ // ceiling1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_ceil2.cc b/src/integer/division/cl_I_ceil2.cc index 75795db..27f8a1b 100644 --- a/src/integer/division/cl_I_ceil2.cc +++ b/src/integer/division/cl_I_ceil2.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_exquo.cc b/src/integer/division/cl_I_exquo.cc index 5028e72..036c10d 100644 --- a/src/integer/division/cl_I_exquo.cc +++ b/src/integer/division/cl_I_exquo.cc @@ -1,7 +1,7 @@ // exquo(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_exquo_exception.cc b/src/integer/division/cl_I_exquo_exception.cc index 6ac671e..6c1b1fd 100644 --- a/src/integer/division/cl_I_exquo_exception.cc +++ b/src/integer/division/cl_I_exquo_exception.cc @@ -1,7 +1,7 @@ // exquo_exception(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/division/cl_I_exquopos.cc b/src/integer/division/cl_I_exquopos.cc index 2ec651d..8ca149c 100644 --- a/src/integer/division/cl_I_exquopos.cc +++ b/src/integer/division/cl_I_exquopos.cc @@ -1,7 +1,7 @@ // exquopos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_floor1.cc b/src/integer/division/cl_I_floor1.cc index 18996d0..83109ac 100644 --- a/src/integer/division/cl_I_floor1.cc +++ b/src/integer/division/cl_I_floor1.cc @@ -1,7 +1,7 @@ // floor1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_floor2.cc b/src/integer/division/cl_I_floor2.cc index 962500f..08b511d 100644 --- a/src/integer/division/cl_I_floor2.cc +++ b/src/integer/division/cl_I_floor2.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_mod.cc b/src/integer/division/cl_I_mod.cc index 34bf816..e4cd15e 100644 --- a/src/integer/division/cl_I_mod.cc +++ b/src/integer/division/cl_I_mod.cc @@ -1,7 +1,7 @@ // mod(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_rem.cc b/src/integer/division/cl_I_rem.cc index 139837e..476e954 100644 --- a/src/integer/division/cl_I_rem.cc +++ b/src/integer/division/cl_I_rem.cc @@ -1,7 +1,7 @@ // rem(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_round1.cc b/src/integer/division/cl_I_round1.cc index 117835e..e85bba4 100644 --- a/src/integer/division/cl_I_round1.cc +++ b/src/integer/division/cl_I_round1.cc @@ -1,7 +1,7 @@ // round1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_round2.cc b/src/integer/division/cl_I_round2.cc index 3aa5990..e48f6bf 100644 --- a/src/integer/division/cl_I_round2.cc +++ b/src/integer/division/cl_I_round2.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_trunc1.cc b/src/integer/division/cl_I_trunc1.cc index a499d9d..8e08959 100644 --- a/src/integer/division/cl_I_trunc1.cc +++ b/src/integer/division/cl_I_trunc1.cc @@ -1,7 +1,7 @@ // truncate1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/division/cl_I_trunc2.cc b/src/integer/division/cl_I_trunc2.cc index ac399cc..7b59bd8 100644 --- a/src/integer/division/cl_I_trunc2.cc +++ b/src/integer/division/cl_I_trunc2.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/elem/Makeflags b/src/integer/elem/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/elem/cl_I_compare.cc b/src/integer/elem/cl_I_compare.cc index 9bf7a4f..f4b9358 100644 --- a/src/integer/elem/cl_I_compare.cc +++ b/src/integer/elem/cl_I_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_div.cc b/src/integer/elem/cl_I_div.cc index c6adb05..79a2c67 100644 --- a/src/integer/elem/cl_I_div.cc +++ b/src/integer/elem/cl_I_div.cc @@ -1,10 +1,10 @@ // cl_divide(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. diff --git a/src/integer/elem/cl_I_equal.cc b/src/integer/elem/cl_I_equal.cc index c34719f..85980c7 100644 --- a/src/integer/elem/cl_I_equal.cc +++ b/src/integer/elem/cl_I_equal.cc @@ -1,7 +1,7 @@ // equal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_minus.cc b/src/integer/elem/cl_I_minus.cc index d2b920b..6dd3ad0 100644 --- a/src/integer/elem/cl_I_minus.cc +++ b/src/integer/elem/cl_I_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_minus1.cc b/src/integer/elem/cl_I_minus1.cc index d717e10..ce27834 100644 --- a/src/integer/elem/cl_I_minus1.cc +++ b/src/integer/elem/cl_I_minus1.cc @@ -1,7 +1,7 @@ // minus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_minusp.cc b/src/integer/elem/cl_I_minusp.cc index 898543c..883bb9c 100644 --- a/src/integer/elem/cl_I_minusp.cc +++ b/src/integer/elem/cl_I_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,7 +10,7 @@ // Implementation. #define minusp inline_minusp -#include "cl_I.h" +#include "integer/cl_I.h" #undef minusp namespace cln { diff --git a/src/integer/elem/cl_I_mul.cc b/src/integer/elem/cl_I_mul.cc index db75653..27024ff 100644 --- a/src/integer/elem/cl_I_mul.cc +++ b/src/integer/elem/cl_I_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_low.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/integer/elem/cl_I_plus.cc b/src/integer/elem/cl_I_plus.cc index eb27c51..07f2a50 100644 --- a/src/integer/elem/cl_I_plus.cc +++ b/src/integer/elem/cl_I_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_plus1.cc b/src/integer/elem/cl_I_plus1.cc index 45671a8..a297f14 100644 --- a/src/integer/elem/cl_I_plus1.cc +++ b/src/integer/elem/cl_I_plus1.cc @@ -1,7 +1,7 @@ // plus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_plusp.cc b/src/integer/elem/cl_I_plusp.cc index 0cbd1f5..f4ad52f 100644 --- a/src/integer/elem/cl_I_plusp.cc +++ b/src/integer/elem/cl_I_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -11,7 +11,7 @@ #define minusp inline_minusp #define zerop inline_zerop -#include "cl_I.h" +#include "integer/cl_I.h" #undef zerop #undef minusp diff --git a/src/integer/elem/cl_I_square.cc b/src/integer/elem/cl_I_square.cc index 257e981..3474a40 100644 --- a/src/integer/elem/cl_I_square.cc +++ b/src/integer/elem/cl_I_square.cc @@ -1,7 +1,7 @@ // square(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_low.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/integer/elem/cl_I_uminus.cc b/src/integer/elem/cl_I_uminus.cc index 6d493a7..f8732f0 100644 --- a/src/integer/elem/cl_I_uminus.cc +++ b/src/integer/elem/cl_I_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/elem/cl_I_zerop.cc b/src/integer/elem/cl_I_zerop.cc index c0537fd..1a48da8 100644 --- a/src/integer/elem/cl_I_zerop.cc +++ b/src/integer/elem/cl_I_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -10,7 +10,7 @@ // Implementation. #define zerop inline_zerop -#include "cl_I.h" +#include "integer/cl_I.h" #undef zerop namespace cln { diff --git a/src/integer/gcd/Makeflags b/src/integer/gcd/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/gcd/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/gcd/cl_I_gcd.cc b/src/integer/gcd/cl_I_gcd.cc index 4252d51..4526731 100644 --- a/src/integer/gcd/cl_I_gcd.cc +++ b/src/integer/gcd/cl_I_gcd.cc @@ -1,7 +1,7 @@ // gcd(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_D.h" -#include "cl_xmacros.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/digit/cl_D.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/integer/gcd/cl_I_gcd_aux.cc b/src/integer/gcd/cl_I_gcd_aux.cc index 35a1e4a..922f62f 100644 --- a/src/integer/gcd/cl_I_gcd_aux.cc +++ b/src/integer/gcd/cl_I_gcd_aux.cc @@ -1,16 +1,16 @@ // partial_gcd(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. #include "cln/integer.h" -#include "cl_D.h" +#include "base/digit/cl_D.h" namespace cln { diff --git a/src/integer/gcd/cl_I_gcd_aux2.cc b/src/integer/gcd/cl_I_gcd_aux2.cc index 2ba09b6..266bcdb 100644 --- a/src/integer/gcd/cl_I_gcd_aux2.cc +++ b/src/integer/gcd/cl_I_gcd_aux2.cc @@ -1,16 +1,16 @@ // partial_gcd(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. #include "cln/integer.h" -#include "cl_D.h" +#include "base/digit/cl_D.h" namespace cln { diff --git a/src/integer/gcd/cl_I_lcm.cc b/src/integer/gcd/cl_I_lcm.cc index 316989c..956360a 100644 --- a/src/integer/gcd/cl_I_lcm.cc +++ b/src/integer/gcd/cl_I_lcm.cc @@ -1,7 +1,7 @@ // lcm(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/gcd/cl_I_xgcd.cc b/src/integer/gcd/cl_I_xgcd.cc index 76ec942..6245547 100644 --- a/src/integer/gcd/cl_I_xgcd.cc +++ b/src/integer/gcd/cl_I_xgcd.cc @@ -1,7 +1,7 @@ // xgcd(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_D.h" -#include "cl_xmacros.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/digit/cl_D.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/integer/gcd/cl_low_gcd.cc b/src/integer/gcd/cl_low_gcd.cc index ed32bfd..1a4c35e 100644 --- a/src/integer/gcd/cl_low_gcd.cc +++ b/src/integer/gcd/cl_low_gcd.cc @@ -1,7 +1,7 @@ // gcd(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/hash/Makeflags b/src/integer/hash/Makeflags deleted file mode 100644 index fc69747..0000000 --- a/src/integer/hash/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/hash diff --git a/src/integer/hash/cl_I_hash_gcobject.cc b/src/integer/hash/cl_I_hash_gcobject.cc index a73382d..3eb9f15 100644 --- a/src/integer/hash/cl_I_hash_gcobject.cc +++ b/src/integer/hash/cl_I_hash_gcobject.cc @@ -1,16 +1,16 @@ // class cl_ht_from_integer_to_gcobject. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_hash_gcobject.h" +#include "integer/hash/cl_I_hash_gcobject.h" // Implementation. -#include "cl_I.h" -#include "cl_hash1.h" +#include "integer/cl_I.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_gcobject.h b/src/integer/hash/cl_I_hash_gcobject.h index a0b4671..49d2d18 100644 --- a/src/integer/hash/cl_I_hash_gcobject.h +++ b/src/integer/hash/cl_I_hash_gcobject.h @@ -5,7 +5,7 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_hash1.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_gcpointer.cc b/src/integer/hash/cl_I_hash_gcpointer.cc index b21b6ac..f6d2202 100644 --- a/src/integer/hash/cl_I_hash_gcpointer.cc +++ b/src/integer/hash/cl_I_hash_gcpointer.cc @@ -1,16 +1,16 @@ // class cl_ht_from_integer_to_gcpointer. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_hash_gcpointer.h" +#include "integer/hash/cl_I_hash_gcpointer.h" // Implementation. -#include "cl_I.h" -#include "cl_hash1.h" +#include "integer/cl_I.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_gcpointer.h b/src/integer/hash/cl_I_hash_gcpointer.h index 484a73d..a57ed42 100644 --- a/src/integer/hash/cl_I_hash_gcpointer.h +++ b/src/integer/hash/cl_I_hash_gcpointer.h @@ -5,7 +5,7 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_hash1.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_pointer.cc b/src/integer/hash/cl_I_hash_pointer.cc index 5ac0e46..c1ed150 100644 --- a/src/integer/hash/cl_I_hash_pointer.cc +++ b/src/integer/hash/cl_I_hash_pointer.cc @@ -1,16 +1,16 @@ // class cl_ht_from_integer_to_pointer. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_hash_pointer.h" +#include "integer/hash/cl_I_hash_pointer.h" // Implementation. -#include "cl_I.h" -#include "cl_hash1.h" +#include "integer/cl_I.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_pointer.h b/src/integer/hash/cl_I_hash_pointer.h index 1c136d3..74436f8 100644 --- a/src/integer/hash/cl_I_hash_pointer.h +++ b/src/integer/hash/cl_I_hash_pointer.h @@ -5,7 +5,7 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_hash1.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_rcobject.cc b/src/integer/hash/cl_I_hash_rcobject.cc index cafebb7..d77b53f 100644 --- a/src/integer/hash/cl_I_hash_rcobject.cc +++ b/src/integer/hash/cl_I_hash_rcobject.cc @@ -1,16 +1,16 @@ // class cl_ht_from_integer_to_rcobject. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_hash_rcobject.h" +#include "integer/hash/cl_I_hash_rcobject.h" // Implementation. -#include "cl_I.h" -#include "cl_hash1.h" +#include "integer/cl_I.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_rcobject.h b/src/integer/hash/cl_I_hash_rcobject.h index b6c385a..42bfb37 100644 --- a/src/integer/hash/cl_I_hash_rcobject.h +++ b/src/integer/hash/cl_I_hash_rcobject.h @@ -5,7 +5,7 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_hash1.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_rcpointer.cc b/src/integer/hash/cl_I_hash_rcpointer.cc index dbbc19e..8ef2ae6 100644 --- a/src/integer/hash/cl_I_hash_rcpointer.cc +++ b/src/integer/hash/cl_I_hash_rcpointer.cc @@ -1,16 +1,16 @@ // class cl_ht_from_integer_to_rcpointer. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_hash_rcpointer.h" +#include "integer/hash/cl_I_hash_rcpointer.h" // Implementation. -#include "cl_I.h" -#include "cl_hash1.h" +#include "integer/cl_I.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hash_rcpointer.h b/src/integer/hash/cl_I_hash_rcpointer.h index 9d9ee3d..f3c9a47 100644 --- a/src/integer/hash/cl_I_hash_rcpointer.h +++ b/src/integer/hash/cl_I_hash_rcpointer.h @@ -5,7 +5,7 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_hash1.h" +#include "base/hash/cl_hash1.h" namespace cln { diff --git a/src/integer/hash/cl_I_hashcode.cc b/src/integer/hash/cl_I_hashcode.cc index e316ff8..080f2f2 100644 --- a/src/integer/hash/cl_I_hashcode.cc +++ b/src/integer/hash/cl_I_hashcode.cc @@ -1,10 +1,10 @@ // cl_I hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I.h" +#include "integer/cl_I.h" // Implementation. diff --git a/src/integer/hash/cl_I_hashweak_rcpointer.cc b/src/integer/hash/cl_I_hashweak_rcpointer.cc index cc4849f..ef126a3 100644 --- a/src/integer/hash/cl_I_hashweak_rcpointer.cc +++ b/src/integer/hash/cl_I_hashweak_rcpointer.cc @@ -1,16 +1,16 @@ // class cl_wht_from_integer_to_rcpointer. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_hashweak_rcpointer.h" +#include "integer/hash/cl_I_hashweak_rcpointer.h" // Implementation. -#include "cl_I.h" -#include "cl_hash1weak.h" +#include "integer/cl_I.h" +#include "base/hash/cl_hash1weak.h" namespace cln { diff --git a/src/integer/hash/cl_I_hashweak_rcpointer.h b/src/integer/hash/cl_I_hashweak_rcpointer.h index 11f4b70..c904856 100644 --- a/src/integer/hash/cl_I_hashweak_rcpointer.h +++ b/src/integer/hash/cl_I_hashweak_rcpointer.h @@ -5,7 +5,7 @@ #include "cln/number.h" #include "cln/integer.h" -#include "cl_hash1weak.h" +#include "base/hash/cl_hash1weak.h" namespace cln { diff --git a/src/integer/input/Makeflags b/src/integer/input/Makeflags deleted file mode 100644 index 542d768..0000000 --- a/src/integer/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/string diff --git a/src/integer/input/cl_I_from_string.cc b/src/integer/input/cl_I_from_string.cc index ce594ea..de8ef80 100644 --- a/src/integer/input/cl_I_from_string.cc +++ b/src/integer/input/cl_I_from_string.cc @@ -1,7 +1,7 @@ // cl_I (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_class.h" diff --git a/src/integer/input/cl_I_read.cc b/src/integer/input/cl_I_read.cc index d3faace..320d5f5 100644 --- a/src/integer/input/cl_I_read.cc +++ b/src/integer/input/cl_I_read.cc @@ -3,7 +3,7 @@ // It does not pull in all the rational number code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" @@ -15,7 +15,7 @@ #include #include "cln/input.h" #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/input/cl_I_read_stream.cc b/src/integer/input/cl_I_read_stream.cc index 1ffd54b..2f4e3db 100644 --- a/src/integer/input/cl_I_read_stream.cc +++ b/src/integer/input/cl_I_read_stream.cc @@ -3,7 +3,7 @@ // It does not pull in all the rational number code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" @@ -13,7 +13,7 @@ #include "cln/input.h" #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/integer/input/cl_I_readparsed.cc b/src/integer/input/cl_I_readparsed.cc index 26c9daa..9ed4f9a 100644 --- a/src/integer/input/cl_I_readparsed.cc +++ b/src/integer/input/cl_I_readparsed.cc @@ -1,7 +1,7 @@ // read_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/misc/Makeflags b/src/integer/misc/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/misc/cl_BN_class.cc b/src/integer/misc/cl_BN_class.cc index f801583..ab84eec 100644 --- a/src/integer/misc/cl_BN_class.cc +++ b/src/integer/misc/cl_BN_class.cc @@ -1,7 +1,7 @@ // cl_class_bignum. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/misc/cl_FN_class.cc b/src/integer/misc/cl_FN_class.cc index 03cfdc7..e132f08 100644 --- a/src/integer/misc/cl_FN_class.cc +++ b/src/integer/misc/cl_FN_class.cc @@ -1,7 +1,7 @@ // cl_class_fixnum. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/misc/cl_I_abs.cc b/src/integer/misc/cl_I_abs.cc index 80a4913..edf6f65 100644 --- a/src/integer/misc/cl_I_abs.cc +++ b/src/integer/misc/cl_I_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/misc/cl_I_as.cc b/src/integer/misc/cl_I_as.cc index c75553d..e755603 100644 --- a/src/integer/misc/cl_I_as.cc +++ b/src/integer/misc/cl_I_as.cc @@ -1,7 +1,7 @@ // cl_I_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/integer/misc/cl_I_debug.cc b/src/integer/misc/cl_I_debug.cc index 8ced7a1..8fa2177 100644 --- a/src/integer/misc/cl_I_debug.cc +++ b/src/integer/misc/cl_I_debug.cc @@ -1,7 +1,7 @@ // cl_I debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/integer/misc/cl_I_eqhashcode.cc b/src/integer/misc/cl_I_eqhashcode.cc index 6d89ff6..ad21e2f 100644 --- a/src/integer/misc/cl_I_eqhashcode.cc +++ b/src/integer/misc/cl_I_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_I equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_N.h" -#include "cl_I.h" +#include "base/cl_N.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/misc/cl_I_exptpos.cc b/src/integer/misc/cl_I_exptpos.cc index 1bb1425..6e46054 100644 --- a/src/integer/misc/cl_I_exptpos.cc +++ b/src/integer/misc/cl_I_exptpos.cc @@ -1,7 +1,7 @@ // expt_pos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/misc/cl_I_exptpos_I.cc b/src/integer/misc/cl_I_exptpos_I.cc index 06d9e1c..0f59df1 100644 --- a/src/integer/misc/cl_I_exptpos_I.cc +++ b/src/integer/misc/cl_I_exptpos_I.cc @@ -1,7 +1,7 @@ // expt_pos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/misc/cl_I_max.cc b/src/integer/misc/cl_I_max.cc index fd2e553..c9d62f0 100644 --- a/src/integer/misc/cl_I_max.cc +++ b/src/integer/misc/cl_I_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/misc/cl_I_min.cc b/src/integer/misc/cl_I_min.cc index 7c4ea33..0ab7f9c 100644 --- a/src/integer/misc/cl_I_min.cc +++ b/src/integer/misc/cl_I_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" diff --git a/src/integer/misc/cl_I_oddp.cc b/src/integer/misc/cl_I_oddp.cc index 5721e10..957c432 100644 --- a/src/integer/misc/cl_I_oddp.cc +++ b/src/integer/misc/cl_I_oddp.cc @@ -1,7 +1,7 @@ // oddp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/misc/cl_I_ord2.cc b/src/integer/misc/cl_I_ord2.cc index efa70f6..0757ffc 100644 --- a/src/integer/misc/cl_I_ord2.cc +++ b/src/integer/misc/cl_I_ord2.cc @@ -1,7 +1,7 @@ // ord2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/misc/cl_I_power2p.cc b/src/integer/misc/cl_I_power2p.cc index 26ec641..143d08b 100644 --- a/src/integer/misc/cl_I_power2p.cc +++ b/src/integer/misc/cl_I_power2p.cc @@ -1,7 +1,7 @@ // power2p(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/misc/cl_I_signum.cc b/src/integer/misc/cl_I_signum.cc index 581bc1a..02d28d1 100644 --- a/src/integer/misc/cl_I_signum.cc +++ b/src/integer/misc/cl_I_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/misc/combin/Makeflags b/src/integer/misc/combin/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/misc/combin/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/misc/combin/cl_I_binomial.cc b/src/integer/misc/combin/cl_I_binomial.cc index cb80433..4c612b5 100644 --- a/src/integer/misc/combin/cl_I_binomial.cc +++ b/src/integer/misc/combin/cl_I_binomial.cc @@ -1,7 +1,7 @@ // binomial(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I_combin.h" +#include "integer/misc/combin/cl_I_combin.h" namespace cln { diff --git a/src/integer/misc/combin/cl_I_doublefactorial.cc b/src/integer/misc/combin/cl_I_doublefactorial.cc index 4508461..74acc91 100644 --- a/src/integer/misc/combin/cl_I_doublefactorial.cc +++ b/src/integer/misc/combin/cl_I_doublefactorial.cc @@ -1,7 +1,7 @@ // doublefactorial(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_I_combin.h" +#include "integer/cl_I.h" +#include "integer/misc/combin/cl_I_combin.h" namespace cln { diff --git a/src/integer/misc/combin/cl_I_factorial.cc b/src/integer/misc/combin/cl_I_factorial.cc index 4e7917c..98b9052 100644 --- a/src/integer/misc/combin/cl_I_factorial.cc +++ b/src/integer/misc/combin/cl_I_factorial.cc @@ -1,7 +1,7 @@ // factorial(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_I_combin.h" +#include "integer/cl_I.h" +#include "integer/misc/combin/cl_I_combin.h" namespace cln { diff --git a/src/integer/misc/combin/cl_I_factorial_aux.cc b/src/integer/misc/combin/cl_I_factorial_aux.cc index 67d6abb..dd0541f 100644 --- a/src/integer/misc/combin/cl_I_factorial_aux.cc +++ b/src/integer/misc/combin/cl_I_factorial_aux.cc @@ -1,15 +1,15 @@ // cl_I_prod_ungerade(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_I_combin.h" +#include "integer/misc/combin/cl_I_combin.h" // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/integer/output/Makeflags b/src/integer/output/Makeflags deleted file mode 100644 index 542d768..0000000 --- a/src/integer/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/string diff --git a/src/integer/output/cl_I_aprint.cc b/src/integer/output/cl_I_aprint.cc index c65b445..d63438b 100644 --- a/src/integer/output/cl_I_aprint.cc +++ b/src/integer/output/cl_I_aprint.cc @@ -1,7 +1,7 @@ // print_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" diff --git a/src/integer/output/cl_I_bprint.cc b/src/integer/output/cl_I_bprint.cc index d718333..9155b3e 100644 --- a/src/integer/output/cl_I_bprint.cc +++ b/src/integer/output/cl_I_bprint.cc @@ -1,7 +1,7 @@ // print_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" diff --git a/src/integer/output/cl_I_cprint.cc b/src/integer/output/cl_I_cprint.cc index 4479125..9af2a00 100644 --- a/src/integer/output/cl_I_cprint.cc +++ b/src/integer/output/cl_I_cprint.cc @@ -1,7 +1,7 @@ // print_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" diff --git a/src/integer/output/cl_I_decstring.cc b/src/integer/output/cl_I_decstring.cc index 67f3847..4b2cce6 100644 --- a/src/integer/output/cl_I_decstring.cc +++ b/src/integer/output/cl_I_decstring.cc @@ -1,7 +1,7 @@ // cl_decimal_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_sstring.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/string/cl_sstring.h" namespace cln { diff --git a/src/integer/output/cl_I_dprint.cc b/src/integer/output/cl_I_dprint.cc index e79f62e..4d90e71 100644 --- a/src/integer/output/cl_I_dprint.cc +++ b/src/integer/output/cl_I_dprint.cc @@ -1,7 +1,7 @@ // print_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" diff --git a/src/integer/output/cl_I_print.cc b/src/integer/output/cl_I_print.cc index eceb6b9..ff1f158 100644 --- a/src/integer/output/cl_I_print.cc +++ b/src/integer/output/cl_I_print.cc @@ -1,7 +1,7 @@ // print_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/io.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/output/cl_I_print_string.cc b/src/integer/output/cl_I_print_string.cc index 1ba99ae..8359752 100644 --- a/src/integer/output/cl_I_print_string.cc +++ b/src/integer/output/cl_I_print_string.cc @@ -1,7 +1,7 @@ // print_integer_to_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_io.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_sstring.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/string/cl_sstring.h" namespace cln { diff --git a/src/integer/random/Makeflags b/src/integer/random/Makeflags deleted file mode 100644 index 61e5ec7..0000000 --- a/src/integer/random/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/random diff --git a/src/integer/random/cl_I_random.cc b/src/integer/random/cl_I_random.cc index d05e00b..aabc640 100644 --- a/src/integer/random/cl_I_random.cc +++ b/src/integer/random/cl_I_random.cc @@ -1,7 +1,7 @@ // random_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_random_impl.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "base/random/cl_random_impl.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/random/cl_I_trandom.cc b/src/integer/random/cl_I_trandom.cc index 1896b4e..88e5e67 100644 --- a/src/integer/random/cl_I_trandom.cc +++ b/src/integer/random/cl_I_trandom.cc @@ -1,7 +1,7 @@ // testrandom_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_random_impl.h" -#include "cl_I.h" -#include "cl_DS.h" +#include "base/random/cl_random_impl.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" namespace cln { diff --git a/src/integer/ring/Makeflags b/src/integer/ring/Makeflags deleted file mode 100644 index 3696f90..0000000 --- a/src/integer/ring/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/integer/Makeflags -SUBDIR_INCLUDES += diff --git a/src/integer/ring/cl_0_ring.cc b/src/integer/ring/cl_0_ring.cc index cc42acb..41f2d1d 100644 --- a/src/integer/ring/cl_0_ring.cc +++ b/src/integer/ring/cl_0_ring.cc @@ -1,7 +1,7 @@ // Null ring. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/integer/ring/cl_I_ring.cc b/src/integer/ring/cl_I_ring.cc index e32acee..f09588b 100644 --- a/src/integer/ring/cl_I_ring.cc +++ b/src/integer/ring/cl_I_ring.cc @@ -1,7 +1,7 @@ // Ring of integers. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/integer_ring.h" @@ -12,7 +12,7 @@ #include "cln/integer.h" #include "cln/integer_io.h" #define zerop zerop_inline -#include "cl_I.h" +#include "integer/cl_I.h" #undef zerop namespace cln { diff --git a/src/modinteger/Makeflags b/src/modinteger/Makeflags deleted file mode 100644 index d253236..0000000 --- a/src/modinteger/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/integer/hash -I$(srcdir)/integer -I$(srcdir)/base/hash -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/modinteger/cl_MI.cc b/src/modinteger/cl_MI.cc index 3463d1f..1458b5b 100644 --- a/src/modinteger/cl_MI.cc +++ b/src/modinteger/cl_MI.cc @@ -1,22 +1,22 @@ // Modular integer operations. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/modinteger.h" // Implementation. -#include "cl_I.h" -#include "cl_DS.h" -#include "cl_2DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" +#include "base/digitseq/cl_2DS.h" #include "cln/io.h" #include "cln/integer_io.h" -#include "cl_N.h" -#include "cl_MI.h" +#include "base/cl_N.h" +#include "modinteger/cl_MI.h" #include "cln/exception.h" -#include "cl_alloca.h" +#include "base/cl_alloca.h" // MacOS X does "#define _R 0x00040000L" // Grr... @@ -62,19 +62,19 @@ static bool modint_equal (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& } } // namespace cln -#include "cl_MI_int.h" -#include "cl_MI_std.h" -#include "cl_MI_fix16.h" +#include "modinteger/cl_MI_int.h" +#include "modinteger/cl_MI_std.h" +#include "modinteger/cl_MI_fix16.h" #if (cl_value_len <= 32) -#include "cl_MI_fix29.h" -#include "cl_MI_int32.h" +#include "modinteger/cl_MI_fix29.h" +#include "modinteger/cl_MI_int32.h" #else -#include "cl_MI_fix32.h" +#include "modinteger/cl_MI_fix32.h" #endif -#include "cl_MI_pow2.h" -#include "cl_MI_pow2m1.h" -#include "cl_MI_pow2p1.h" -#include "cl_MI_montgom.h" +#include "modinteger/cl_MI_pow2.h" +#include "modinteger/cl_MI_pow2m1.h" +#include "modinteger/cl_MI_pow2p1.h" +#include "modinteger/cl_MI_montgom.h" namespace cln { @@ -127,7 +127,7 @@ static inline cl_heap_modint_ring* make_modint_ring (const cl_I& m) // m >= 0 // (It could also be a weak hashuniq table cl_I -> cl_modint_ring.) } // namespace cln -#include "cl_I_hashweak_rcpointer.h" +#include "integer/hash/cl_I_hashweak_rcpointer.h" namespace cln { // An entry can be collected when the value (the ring) isn't referenced any more diff --git a/src/modinteger/cl_MI_cond_composite.cc b/src/modinteger/cl_MI_cond_composite.cc index 8780365..3e00f2e 100644 --- a/src/modinteger/cl_MI_cond_composite.cc +++ b/src/modinteger/cl_MI_cond_composite.cc @@ -1,7 +1,7 @@ // class cl_composite_condition. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/modinteger.h" diff --git a/src/modinteger/cl_MI_debug.cc b/src/modinteger/cl_MI_debug.cc index 21a7d5e..0197c5b 100644 --- a/src/modinteger/cl_MI_debug.cc +++ b/src/modinteger/cl_MI_debug.cc @@ -1,7 +1,7 @@ // cl_modint_ring debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/modinteger/cl_MI_err_comp.cc b/src/modinteger/cl_MI_err_comp.cc index 4859061..b9176fe 100644 --- a/src/modinteger/cl_MI_err_comp.cc +++ b/src/modinteger/cl_MI_err_comp.cc @@ -1,10 +1,10 @@ // cl_notify_composite(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_MI.h" +#include "modinteger/cl_MI.h" // Implementation. diff --git a/src/modinteger/cl_MI_lshift.cc b/src/modinteger/cl_MI_lshift.cc index 9c8146e..47881d0 100644 --- a/src/modinteger/cl_MI_lshift.cc +++ b/src/modinteger/cl_MI_lshift.cc @@ -1,7 +1,7 @@ // operator<< on cl_MI. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/modinteger.h" diff --git a/src/modinteger/cl_MI_rshift.cc b/src/modinteger/cl_MI_rshift.cc index a5a4ffe..a4fec8b 100644 --- a/src/modinteger/cl_MI_rshift.cc +++ b/src/modinteger/cl_MI_rshift.cc @@ -1,7 +1,7 @@ // operator>> on cl_MI. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/modinteger.h" @@ -11,7 +11,7 @@ #include "cln/integer.h" #include "cln/exception.h" -#include "cl_MI.h" +#include "modinteger/cl_MI.h" namespace cln { diff --git a/src/modpolynomial/Makeflags b/src/modpolynomial/Makeflags deleted file mode 100644 index 4b0afee..0000000 --- a/src/modpolynomial/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = diff --git a/src/numtheory/Makeflags b/src/numtheory/Makeflags deleted file mode 100644 index 2375994..0000000 --- a/src/numtheory/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/numtheory/cl_IF_millerrabin.cc b/src/numtheory/cl_IF_millerrabin.cc index 3d7c99f..dbfd541 100644 --- a/src/numtheory/cl_IF_millerrabin.cc +++ b/src/numtheory/cl_IF_millerrabin.cc @@ -1,10 +1,10 @@ // cl_miller_rabin_test(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_IF.h" +#include "numtheory/cl_IF.h" // Implementation. diff --git a/src/numtheory/cl_IF_smallprimes.cc b/src/numtheory/cl_IF_smallprimes.cc index 4193bcb..db17ae9 100644 --- a/src/numtheory/cl_IF_smallprimes.cc +++ b/src/numtheory/cl_IF_smallprimes.cc @@ -1,10 +1,10 @@ // cl_small_prime_table. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_IF.h" +#include "numtheory/cl_IF.h" // Implementation. diff --git a/src/numtheory/cl_IF_trialdiv.cc b/src/numtheory/cl_IF_trialdiv.cc index 70f4f62..22b1704 100644 --- a/src/numtheory/cl_IF_trialdiv.cc +++ b/src/numtheory/cl_IF_trialdiv.cc @@ -1,15 +1,15 @@ // cl_trialdivision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_IF.h" +#include "numtheory/cl_IF.h" // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" #if !(intDsize >= 16) #error "intDsize too small for trialdivision!" diff --git a/src/numtheory/cl_IF_trialdiv1.cc b/src/numtheory/cl_IF_trialdiv1.cc index b4ebe1f..5cec7c6 100644 --- a/src/numtheory/cl_IF_trialdiv1.cc +++ b/src/numtheory/cl_IF_trialdiv1.cc @@ -1,15 +1,15 @@ // cl_trialdivision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_IF.h" +#include "numtheory/cl_IF.h" // Implementation. -#include "cl_low.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/numtheory/cl_IF_trialdiv2.cc b/src/numtheory/cl_IF_trialdiv2.cc index ca51b84..a6b0095 100644 --- a/src/numtheory/cl_IF_trialdiv2.cc +++ b/src/numtheory/cl_IF_trialdiv2.cc @@ -1,15 +1,15 @@ // cl_trialdivision(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_IF.h" +#include "numtheory/cl_IF.h" // Implementation. -#include "cl_low.h" +#include "base/cl_low.h" namespace cln { diff --git a/src/numtheory/cl_nt_cornacchia1.cc b/src/numtheory/cl_nt_cornacchia1.cc index e43405a..3224ccf 100644 --- a/src/numtheory/cl_nt_cornacchia1.cc +++ b/src/numtheory/cl_nt_cornacchia1.cc @@ -1,7 +1,7 @@ // cornacchia1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_xmacros.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/numtheory/cl_nt_cornacchia4.cc b/src/numtheory/cl_nt_cornacchia4.cc index 38204f3..0137996 100644 --- a/src/numtheory/cl_nt_cornacchia4.cc +++ b/src/numtheory/cl_nt_cornacchia4.cc @@ -1,7 +1,7 @@ // cornacchia4(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/numtheory/cl_nt_isprobprime.cc b/src/numtheory/cl_nt_isprobprime.cc index 0f248c3..eadb62f 100644 --- a/src/numtheory/cl_nt_isprobprime.cc +++ b/src/numtheory/cl_nt_isprobprime.cc @@ -1,7 +1,7 @@ // isprobprime(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_IF.h" +#include "numtheory/cl_IF.h" #include "cln/integer_io.h" #include "cln/exception.h" #include diff --git a/src/numtheory/cl_nt_jacobi.cc b/src/numtheory/cl_nt_jacobi.cc index e4cf10c..edc93bd 100644 --- a/src/numtheory/cl_nt_jacobi.cc +++ b/src/numtheory/cl_nt_jacobi.cc @@ -1,7 +1,7 @@ // jacobi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" @@ -10,9 +10,9 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" #include "cln/exception.h" -#include "cl_xmacros.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/numtheory/cl_nt_jacobi_low.cc b/src/numtheory/cl_nt_jacobi_low.cc index 7b706a2..d654700 100644 --- a/src/numtheory/cl_nt_jacobi_low.cc +++ b/src/numtheory/cl_nt_jacobi_low.cc @@ -1,7 +1,7 @@ // jacobi(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/exception.h" -#include "cl_xmacros.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/numtheory/cl_nt_nextprobprime.cc b/src/numtheory/cl_nt_nextprobprime.cc index cf16684..6dfa94b 100644 --- a/src/numtheory/cl_nt_nextprobprime.cc +++ b/src/numtheory/cl_nt_nextprobprime.cc @@ -1,7 +1,7 @@ // nextprobprime(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" diff --git a/src/numtheory/cl_nt_sqrtmodp.cc b/src/numtheory/cl_nt_sqrtmodp.cc index 8c0741e..7b53740 100644 --- a/src/numtheory/cl_nt_sqrtmodp.cc +++ b/src/numtheory/cl_nt_sqrtmodp.cc @@ -1,7 +1,7 @@ // sqrt_mod_p(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/numtheory.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" #include "cln/exception.h" #undef floor diff --git a/src/polynomial/Makeflags b/src/polynomial/Makeflags deleted file mode 100644 index ad57807..0000000 --- a/src/polynomial/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/polynomial -I$(srcdir)/base diff --git a/src/polynomial/elem/Makeflags b/src/polynomial/elem/Makeflags deleted file mode 100644 index 239277b..0000000 --- a/src/polynomial/elem/Makeflags +++ /dev/null @@ -1,5 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/polynomial/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/hash -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase - diff --git a/src/polynomial/elem/cl_UP.cc b/src/polynomial/elem/cl_UP.cc index b3a527f..f81b4b0 100644 --- a/src/polynomial/elem/cl_UP.cc +++ b/src/polynomial/elem/cl_UP.cc @@ -1,13 +1,13 @@ // Univariate Polynomial operations. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #define CL_GV_NO_RANGECHECKS #define CL_SV_NO_RANGECHECKS #include "cln/univpoly.h" -#include "cl_UP.h" +#include "polynomial/cl_UP.h" // Implementation. diff --git a/src/polynomial/elem/cl_UP_GF2.h b/src/polynomial/elem/cl_UP_GF2.h index 0fb5e65..59635a2 100644 --- a/src/polynomial/elem/cl_UP_GF2.h +++ b/src/polynomial/elem/cl_UP_GF2.h @@ -3,7 +3,7 @@ #include "cln/GV_modinteger.h" #include "cln/modinteger.h" #include "cln/GV_integer.h" -#include "cl_DS.h" +#include "base/digitseq/cl_DS.h" #include "cln/exception.h" namespace cln { diff --git a/src/polynomial/elem/cl_UP_named.cc b/src/polynomial/elem/cl_UP_named.cc index 70175b1..679dc78 100644 --- a/src/polynomial/elem/cl_UP_named.cc +++ b/src/polynomial/elem/cl_UP_named.cc @@ -1,7 +1,7 @@ // find_univpoly_ring(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_UP.h" +#include "polynomial/cl_UP.h" namespace cln { @@ -27,7 +27,7 @@ static inline cl_heap_univpoly_ring* cl_make_univpoly_ring (const cl_ring& r, co // The table of univariate polynomial rings with named variable. // A weak hash table (cl_ring,cl_symbol) -> cl_univpoly_ring. -#include "cl_rcpointer2_hashweak_rcpointer.h" +#include "base/hash/cl_rcpointer2_hashweak_rcpointer.h" namespace cln { diff --git a/src/polynomial/elem/cl_UP_no_ring.cc b/src/polynomial/elem/cl_UP_no_ring.cc index 892f963..92f4259 100644 --- a/src/polynomial/elem/cl_UP_no_ring.cc +++ b/src/polynomial/elem/cl_UP_no_ring.cc @@ -1,7 +1,7 @@ // Dummy ring. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly.h" diff --git a/src/polynomial/elem/cl_UP_unnamed.cc b/src/polynomial/elem/cl_UP_unnamed.cc index 8b0ef32..6073530 100644 --- a/src/polynomial/elem/cl_UP_unnamed.cc +++ b/src/polynomial/elem/cl_UP_unnamed.cc @@ -1,7 +1,7 @@ // find_univpoly_ring(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly.h" @@ -9,13 +9,13 @@ // Implementation. -#include "cl_UP.h" +#include "polynomial/cl_UP.h" // The table of univariate polynomial rings without named variable. // A weak hash table cl_ring -> cl_univpoly_ring. // (It could also be a weak hashuniq table cl_ring -> cl_univpoly_ring.) -#include "cl_rcpointer_hashweak_rcpointer.h" +#include "base/hash/cl_rcpointer_hashweak_rcpointer.h" namespace cln { diff --git a/src/polynomial/misc/Makeflags b/src/polynomial/misc/Makeflags deleted file mode 100644 index 76ce56d..0000000 --- a/src/polynomial/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/polynomial/Makeflags -SUBDIR_INCLUDES += diff --git a/src/polynomial/misc/cl_UP_I_hermite.cc b/src/polynomial/misc/cl_UP_I_hermite.cc index 90edea9..52b129e 100644 --- a/src/polynomial/misc/cl_UP_I_hermite.cc +++ b/src/polynomial/misc/cl_UP_I_hermite.cc @@ -1,7 +1,7 @@ // hermite(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly_integer.h" diff --git a/src/polynomial/misc/cl_UP_I_laguerre.cc b/src/polynomial/misc/cl_UP_I_laguerre.cc index 1e0b5d0..382d0fb 100644 --- a/src/polynomial/misc/cl_UP_I_laguerre.cc +++ b/src/polynomial/misc/cl_UP_I_laguerre.cc @@ -1,7 +1,7 @@ // laguerre(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly_integer.h" diff --git a/src/polynomial/misc/cl_UP_I_tchebychev.cc b/src/polynomial/misc/cl_UP_I_tchebychev.cc index 71b76ff..3ee60cd 100644 --- a/src/polynomial/misc/cl_UP_I_tchebychev.cc +++ b/src/polynomial/misc/cl_UP_I_tchebychev.cc @@ -1,7 +1,7 @@ // tschebychev(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly_integer.h" diff --git a/src/polynomial/misc/cl_UP_RA_legendre.cc b/src/polynomial/misc/cl_UP_RA_legendre.cc index f1cb3ce..cc6cfc3 100644 --- a/src/polynomial/misc/cl_UP_RA_legendre.cc +++ b/src/polynomial/misc/cl_UP_RA_legendre.cc @@ -1,7 +1,7 @@ // legendre(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly_rational.h" diff --git a/src/polynomial/misc/cl_UP_debug.cc b/src/polynomial/misc/cl_UP_debug.cc index ca952cd..96e7cad 100644 --- a/src/polynomial/misc/cl_UP_debug.cc +++ b/src/polynomial/misc/cl_UP_debug.cc @@ -1,7 +1,7 @@ // cl_univpoly_ring debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. @@ -9,7 +9,7 @@ // Implementation. #include "cln/univpoly.h" -#include "cl_UP.h" +#include "polynomial/cl_UP.h" #include "cln/io.h" namespace cln { diff --git a/src/polynomial/misc/cl_UP_deriv.cc b/src/polynomial/misc/cl_UP_deriv.cc index a8cae3f..7a9f0bf 100644 --- a/src/polynomial/misc/cl_UP_deriv.cc +++ b/src/polynomial/misc/cl_UP_deriv.cc @@ -1,7 +1,7 @@ // deriv(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/univpoly.h" diff --git a/src/rational/Makeflags b/src/rational/Makeflags deleted file mode 100644 index 4ce48e5..0000000 --- a/src/rational/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/rational/algebraic/Makeflags b/src/rational/algebraic/Makeflags deleted file mode 100644 index 6ed2160..0000000 --- a/src/rational/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += diff --git a/src/rational/algebraic/cl_RA_rootp.cc b/src/rational/algebraic/cl_RA_rootp.cc index 8c458ab..a06a5d5 100644 --- a/src/rational/algebraic/cl_RA_rootp.cc +++ b/src/rational/algebraic/cl_RA_rootp.cc @@ -1,7 +1,7 @@ // rootp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/algebraic/cl_RA_rootp_I.cc b/src/rational/algebraic/cl_RA_rootp_I.cc index 4abcc2e..d0dfa11 100644 --- a/src/rational/algebraic/cl_RA_rootp_I.cc +++ b/src/rational/algebraic/cl_RA_rootp_I.cc @@ -1,7 +1,7 @@ // rootp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/algebraic/cl_RA_sqrtp.cc b/src/rational/algebraic/cl_RA_sqrtp.cc index c534779..bf3956b 100644 --- a/src/rational/algebraic/cl_RA_sqrtp.cc +++ b/src/rational/algebraic/cl_RA_sqrtp.cc @@ -1,7 +1,7 @@ // sqrtp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/cl_RA.h b/src/rational/cl_RA.h index 5adb633..bdd911c 100644 --- a/src/rational/cl_RA.h +++ b/src/rational/cl_RA.h @@ -5,9 +5,9 @@ #include "cln/number.h" #include "cln/rational.h" -#include "cl_macros.h" +#include "base/cl_macros.h" #include "cln/malloc.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/division/Makeflags b/src/rational/division/Makeflags deleted file mode 100644 index 6ed2160..0000000 --- a/src/rational/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += diff --git a/src/rational/division/cl_RA_ceil1.cc b/src/rational/division/cl_RA_ceil1.cc index a61342a..1586b75 100644 --- a/src/rational/division/cl_RA_ceil1.cc +++ b/src/rational/division/cl_RA_ceil1.cc @@ -1,7 +1,7 @@ // ceiling1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_ceil12.cc b/src/rational/division/cl_RA_ceil12.cc index a7e4c3f..fc2376d 100644 --- a/src/rational/division/cl_RA_ceil12.cc +++ b/src/rational/division/cl_RA_ceil12.cc @@ -1,7 +1,7 @@ // ceiling1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_ceil2.cc b/src/rational/division/cl_RA_ceil2.cc index 4d41dd2..605eb72 100644 --- a/src/rational/division/cl_RA_ceil2.cc +++ b/src/rational/division/cl_RA_ceil2.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_ceil22.cc b/src/rational/division/cl_RA_ceil22.cc index ac56d87..3a8463a 100644 --- a/src/rational/division/cl_RA_ceil22.cc +++ b/src/rational/division/cl_RA_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_floor1.cc b/src/rational/division/cl_RA_floor1.cc index 776e53a..c05e25a 100644 --- a/src/rational/division/cl_RA_floor1.cc +++ b/src/rational/division/cl_RA_floor1.cc @@ -1,7 +1,7 @@ // floor1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_floor12.cc b/src/rational/division/cl_RA_floor12.cc index b03d3b6..11ba5bb 100644 --- a/src/rational/division/cl_RA_floor12.cc +++ b/src/rational/division/cl_RA_floor12.cc @@ -1,7 +1,7 @@ // floor1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_floor2.cc b/src/rational/division/cl_RA_floor2.cc index 71b3c2f..1ce200e 100644 --- a/src/rational/division/cl_RA_floor2.cc +++ b/src/rational/division/cl_RA_floor2.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_floor22.cc b/src/rational/division/cl_RA_floor22.cc index 79c3540..01d26f3 100644 --- a/src/rational/division/cl_RA_floor22.cc +++ b/src/rational/division/cl_RA_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_round1.cc b/src/rational/division/cl_RA_round1.cc index 4c2ac7d..932ddc2 100644 --- a/src/rational/division/cl_RA_round1.cc +++ b/src/rational/division/cl_RA_round1.cc @@ -1,7 +1,7 @@ // round1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_round12.cc b/src/rational/division/cl_RA_round12.cc index bf4b060..019c5db 100644 --- a/src/rational/division/cl_RA_round12.cc +++ b/src/rational/division/cl_RA_round12.cc @@ -1,7 +1,7 @@ // round1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_round2.cc b/src/rational/division/cl_RA_round2.cc index 026ace4..5d8a1f8 100644 --- a/src/rational/division/cl_RA_round2.cc +++ b/src/rational/division/cl_RA_round2.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_round22.cc b/src/rational/division/cl_RA_round22.cc index f012d0b..9890257 100644 --- a/src/rational/division/cl_RA_round22.cc +++ b/src/rational/division/cl_RA_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_trunc1.cc b/src/rational/division/cl_RA_trunc1.cc index 323bdd1..83d33bf 100644 --- a/src/rational/division/cl_RA_trunc1.cc +++ b/src/rational/division/cl_RA_trunc1.cc @@ -1,7 +1,7 @@ // truncate1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_trunc12.cc b/src/rational/division/cl_RA_trunc12.cc index d592272..aa29add 100644 --- a/src/rational/division/cl_RA_trunc12.cc +++ b/src/rational/division/cl_RA_trunc12.cc @@ -1,7 +1,7 @@ // truncate1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_trunc2.cc b/src/rational/division/cl_RA_trunc2.cc index 26b5038..19111f0 100644 --- a/src/rational/division/cl_RA_trunc2.cc +++ b/src/rational/division/cl_RA_trunc2.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/division/cl_RA_trunc22.cc b/src/rational/division/cl_RA_trunc22.cc index 702ebae..94667a3 100644 --- a/src/rational/division/cl_RA_trunc22.cc +++ b/src/rational/division/cl_RA_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/Makeflags b/src/rational/elem/Makeflags deleted file mode 100644 index 6ed2160..0000000 --- a/src/rational/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += diff --git a/src/rational/elem/cl_RA_compare.cc b/src/rational/elem/cl_RA_compare.cc index 213ed79..14647f0 100644 --- a/src/rational/elem/cl_RA_compare.cc +++ b/src/rational/elem/cl_RA_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_denominator.cc b/src/rational/elem/cl_RA_denominator.cc index c25ab35..78e23cd 100644 --- a/src/rational/elem/cl_RA_denominator.cc +++ b/src/rational/elem/cl_RA_denominator.cc @@ -1,7 +1,7 @@ // denominator(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -10,7 +10,7 @@ // Implementation. #define denominator inline_denominator -#include "cl_RA.h" +#include "rational/cl_RA.h" #undef denominator namespace cln { diff --git a/src/rational/elem/cl_RA_div.cc b/src/rational/elem/cl_RA_div.cc index fe0d5e7..4a80e76 100644 --- a/src/rational/elem/cl_RA_div.cc +++ b/src/rational/elem/cl_RA_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_equal.cc b/src/rational/elem/cl_RA_equal.cc index 1546ef2..da9a3b6 100644 --- a/src/rational/elem/cl_RA_equal.cc +++ b/src/rational/elem/cl_RA_equal.cc @@ -1,7 +1,7 @@ // equal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_from_I_I_div.cc b/src/rational/elem/cl_RA_from_I_I_div.cc index 823bddb..6378a81 100644 --- a/src/rational/elem/cl_RA_from_I_I_div.cc +++ b/src/rational/elem/cl_RA_from_I_I_div.cc @@ -1,16 +1,16 @@ // I_I_div_RA(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_RA.h" +#include "rational/cl_RA.h" // Implementation. #include "cln/exception.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_from_I_posI.cc b/src/rational/elem/cl_RA_from_I_posI.cc index 3346ee4..2e6bc8c 100644 --- a/src/rational/elem/cl_RA_from_I_posI.cc +++ b/src/rational/elem/cl_RA_from_I_posI.cc @@ -1,15 +1,15 @@ // I_I_to_RA(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_RA.h" +#include "rational/cl_RA.h" // Implementation. -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_from_I_posI1.cc b/src/rational/elem/cl_RA_from_I_posI1.cc index 7bf48d5..888f9cf 100644 --- a/src/rational/elem/cl_RA_from_I_posI1.cc +++ b/src/rational/elem/cl_RA_from_I_posI1.cc @@ -1,10 +1,10 @@ // I_I_to_RT(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_RA.h" +#include "rational/cl_RA.h" // Implementation. diff --git a/src/rational/elem/cl_RA_from_I_posI_div.cc b/src/rational/elem/cl_RA_from_I_posI_div.cc index 2fd501a..8a26be9 100644 --- a/src/rational/elem/cl_RA_from_I_posI_div.cc +++ b/src/rational/elem/cl_RA_from_I_posI_div.cc @@ -1,16 +1,16 @@ // I_posI_div_RA(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_RA.h" +#include "rational/cl_RA.h" // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_minus.cc b/src/rational/elem/cl_RA_minus.cc index 9d02c1c..bf48b07 100644 --- a/src/rational/elem/cl_RA_minus.cc +++ b/src/rational/elem/cl_RA_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_minus1.cc b/src/rational/elem/cl_RA_minus1.cc index b3d368f..42a3492 100644 --- a/src/rational/elem/cl_RA_minus1.cc +++ b/src/rational/elem/cl_RA_minus1.cc @@ -1,7 +1,7 @@ // minus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_minusp.cc b/src/rational/elem/cl_RA_minusp.cc index 4f9019d..5fb553a 100644 --- a/src/rational/elem/cl_RA_minusp.cc +++ b/src/rational/elem/cl_RA_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -10,7 +10,7 @@ // Implementation. #define minusp minusp_inline -#include "cl_RA.h" +#include "rational/cl_RA.h" #undef minusp namespace cln { diff --git a/src/rational/elem/cl_RA_mul.cc b/src/rational/elem/cl_RA_mul.cc index b7458a1..48478ef 100644 --- a/src/rational/elem/cl_RA_mul.cc +++ b/src/rational/elem/cl_RA_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_numerator.cc b/src/rational/elem/cl_RA_numerator.cc index ea5c045..f009301 100644 --- a/src/rational/elem/cl_RA_numerator.cc +++ b/src/rational/elem/cl_RA_numerator.cc @@ -1,7 +1,7 @@ // numerator(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -10,7 +10,7 @@ // Implementation. #define numerator inline_numerator -#include "cl_RA.h" +#include "rational/cl_RA.h" #undef numerator namespace cln { diff --git a/src/rational/elem/cl_RA_plus.cc b/src/rational/elem/cl_RA_plus.cc index e304671..d442039 100644 --- a/src/rational/elem/cl_RA_plus.cc +++ b/src/rational/elem/cl_RA_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_plus1.cc b/src/rational/elem/cl_RA_plus1.cc index ef8f317..5cd1e47 100644 --- a/src/rational/elem/cl_RA_plus1.cc +++ b/src/rational/elem/cl_RA_plus1.cc @@ -1,7 +1,7 @@ // plus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_plusp.cc b/src/rational/elem/cl_RA_plusp.cc index e3ab8bd..dfb0e31 100644 --- a/src/rational/elem/cl_RA_plusp.cc +++ b/src/rational/elem/cl_RA_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -11,7 +11,7 @@ #define minusp inline_minusp #define zerop inline_zerop -#include "cl_RA.h" +#include "rational/cl_RA.h" #undef zerop #undef minusp diff --git a/src/rational/elem/cl_RA_recip.cc b/src/rational/elem/cl_RA_recip.cc index bacd0eb..6a738b3 100644 --- a/src/rational/elem/cl_RA_recip.cc +++ b/src/rational/elem/cl_RA_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -10,8 +10,8 @@ // Implementation. #include "cln/exception.h" -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/elem/cl_RA_square.cc b/src/rational/elem/cl_RA_square.cc index 5d58ba2..02cd0ff 100644 --- a/src/rational/elem/cl_RA_square.cc +++ b/src/rational/elem/cl_RA_square.cc @@ -1,7 +1,7 @@ // square(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_uminus.cc b/src/rational/elem/cl_RA_uminus.cc index d5a8326..92ad533 100644 --- a/src/rational/elem/cl_RA_uminus.cc +++ b/src/rational/elem/cl_RA_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/elem/cl_RA_zerop.cc b/src/rational/elem/cl_RA_zerop.cc index 6d6f8f9..7fe9016 100644 --- a/src/rational/elem/cl_RA_zerop.cc +++ b/src/rational/elem/cl_RA_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -10,7 +10,7 @@ // Implementation. #define zerop inline_zerop -#include "cl_RA.h" +#include "rational/cl_RA.h" #undef zerop namespace cln { diff --git a/src/rational/input/Makeflags b/src/rational/input/Makeflags deleted file mode 100644 index f43d855..0000000 --- a/src/rational/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/string diff --git a/src/rational/input/cl_RA_from_string.cc b/src/rational/input/cl_RA_from_string.cc index c658c07..157f708 100644 --- a/src/rational/input/cl_RA_from_string.cc +++ b/src/rational/input/cl_RA_from_string.cc @@ -1,7 +1,7 @@ // cl_RA (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_class.h" diff --git a/src/rational/input/cl_RA_read.cc b/src/rational/input/cl_RA_read.cc index 6d06522..ec9e7d8 100644 --- a/src/rational/input/cl_RA_read.cc +++ b/src/rational/input/cl_RA_read.cc @@ -4,7 +4,7 @@ // function code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" @@ -17,7 +17,7 @@ #include "cln/input.h" #include "cln/integer.h" #include "cln/integer_io.h" -#include "cl_I.h" +#include "integer/cl_I.h" #include "cln/exception.h" namespace cln { diff --git a/src/rational/input/cl_RA_read_stream.cc b/src/rational/input/cl_RA_read_stream.cc index 6dd171d..d283095 100644 --- a/src/rational/input/cl_RA_read_stream.cc +++ b/src/rational/input/cl_RA_read_stream.cc @@ -4,7 +4,7 @@ // function code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" @@ -14,7 +14,7 @@ #include "cln/input.h" #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/rational/input/cl_RA_readparsed.cc b/src/rational/input/cl_RA_readparsed.cc index 6eb9b95..afe6602 100644 --- a/src/rational/input/cl_RA_readparsed.cc +++ b/src/rational/input/cl_RA_readparsed.cc @@ -1,7 +1,7 @@ // read_rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_RA.h" -#include "cl_I.h" -#include "cl_N.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/rational/misc/Makeflags b/src/rational/misc/Makeflags deleted file mode 100644 index e3b8433..0000000 --- a/src/rational/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/integer/misc diff --git a/src/rational/misc/cl_RA_abs.cc b/src/rational/misc/cl_RA_abs.cc index 9f52421..385d13d 100644 --- a/src/rational/misc/cl_RA_abs.cc +++ b/src/rational/misc/cl_RA_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/misc/cl_RA_as.cc b/src/rational/misc/cl_RA_as.cc index 0f1d946..540c660 100644 --- a/src/rational/misc/cl_RA_as.cc +++ b/src/rational/misc/cl_RA_as.cc @@ -1,7 +1,7 @@ // cl_RA_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/rational/misc/cl_RA_class.cc b/src/rational/misc/cl_RA_class.cc index f6e2a44..69668f2 100644 --- a/src/rational/misc/cl_RA_class.cc +++ b/src/rational/misc/cl_RA_class.cc @@ -1,7 +1,7 @@ // cl_class_ratio. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/rational/misc/cl_RA_debug.cc b/src/rational/misc/cl_RA_debug.cc index 3c4eaa3..d398838 100644 --- a/src/rational/misc/cl_RA_debug.cc +++ b/src/rational/misc/cl_RA_debug.cc @@ -1,7 +1,7 @@ // cl_RA debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/rational/misc/cl_RA_eqhashcode.cc b/src/rational/misc/cl_RA_eqhashcode.cc index 1c481fb..daae04f 100644 --- a/src/rational/misc/cl_RA_eqhashcode.cc +++ b/src/rational/misc/cl_RA_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_RA equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_N.h" -#include "cl_RA.h" -#include "cl_inline.h" -#include "cl_I_eqhashcode.cc" +#include "base/cl_N.h" +#include "rational/cl_RA.h" +#include "base/cl_inline.h" +#include "integer/misc/cl_I_eqhashcode.cc" namespace cln { diff --git a/src/rational/misc/cl_RA_expt.cc b/src/rational/misc/cl_RA_expt.cc index e73e0a1..f1ca48d 100644 --- a/src/rational/misc/cl_RA_expt.cc +++ b/src/rational/misc/cl_RA_expt.cc @@ -1,7 +1,7 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" diff --git a/src/rational/misc/cl_RA_expt_I.cc b/src/rational/misc/cl_RA_expt_I.cc index 1da2036..bb8b642 100644 --- a/src/rational/misc/cl_RA_expt_I.cc +++ b/src/rational/misc/cl_RA_expt_I.cc @@ -1,7 +1,7 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/misc/cl_RA_exptpos.cc b/src/rational/misc/cl_RA_exptpos.cc index 4483a17..550d55e 100644 --- a/src/rational/misc/cl_RA_exptpos.cc +++ b/src/rational/misc/cl_RA_exptpos.cc @@ -1,7 +1,7 @@ // expt_pos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/misc/cl_RA_exptpos_I.cc b/src/rational/misc/cl_RA_exptpos_I.cc index ee9c6cf..9fb1c44 100644 --- a/src/rational/misc/cl_RA_exptpos_I.cc +++ b/src/rational/misc/cl_RA_exptpos_I.cc @@ -1,7 +1,7 @@ // expt_pos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/rational/misc/cl_RA_max.cc b/src/rational/misc/cl_RA_max.cc index 39e30ef..a2396e3 100644 --- a/src/rational/misc/cl_RA_max.cc +++ b/src/rational/misc/cl_RA_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" diff --git a/src/rational/misc/cl_RA_min.cc b/src/rational/misc/cl_RA_min.cc index 2f5bb29..a0fa9d3 100644 --- a/src/rational/misc/cl_RA_min.cc +++ b/src/rational/misc/cl_RA_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" diff --git a/src/rational/misc/cl_RA_signum.cc b/src/rational/misc/cl_RA_signum.cc index bde4c26..72167d0 100644 --- a/src/rational/misc/cl_RA_signum.cc +++ b/src/rational/misc/cl_RA_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/rational/output/Makeflags b/src/rational/output/Makeflags deleted file mode 100644 index 6ed2160..0000000 --- a/src/rational/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += diff --git a/src/rational/output/cl_RA_aprint.cc b/src/rational/output/cl_RA_aprint.cc index 56dd896..e131f91 100644 --- a/src/rational/output/cl_RA_aprint.cc +++ b/src/rational/output/cl_RA_aprint.cc @@ -1,7 +1,7 @@ // print_rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" diff --git a/src/rational/output/cl_RA_bprint.cc b/src/rational/output/cl_RA_bprint.cc index 4c7c66c..8476310 100644 --- a/src/rational/output/cl_RA_bprint.cc +++ b/src/rational/output/cl_RA_bprint.cc @@ -1,7 +1,7 @@ // print_rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" diff --git a/src/rational/output/cl_RA_cprint.cc b/src/rational/output/cl_RA_cprint.cc index bc86188..9d36b13 100644 --- a/src/rational/output/cl_RA_cprint.cc +++ b/src/rational/output/cl_RA_cprint.cc @@ -1,7 +1,7 @@ // print_rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" diff --git a/src/rational/output/cl_RA_dprint.cc b/src/rational/output/cl_RA_dprint.cc index 86e45c2..b4e1b5f 100644 --- a/src/rational/output/cl_RA_dprint.cc +++ b/src/rational/output/cl_RA_dprint.cc @@ -1,7 +1,7 @@ // print_rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" @@ -12,7 +12,7 @@ #include "cln/output.h" #include "cln/integer_io.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/rational/output/cl_RA_print.cc b/src/rational/output/cl_RA_print.cc index f0dbe88..fa18526 100644 --- a/src/rational/output/cl_RA_print.cc +++ b/src/rational/output/cl_RA_print.cc @@ -1,7 +1,7 @@ // print_rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_io.h" @@ -11,7 +11,7 @@ #include "cln/integer_io.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/rational/ring/Makeflags b/src/rational/ring/Makeflags deleted file mode 100644 index 6ed2160..0000000 --- a/src/rational/ring/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += diff --git a/src/rational/ring/cl_RA_ring.cc b/src/rational/ring/cl_RA_ring.cc index b42130f..50fa33d 100644 --- a/src/rational/ring/cl_RA_ring.cc +++ b/src/rational/ring/cl_RA_ring.cc @@ -1,7 +1,7 @@ // Ring of rational numbers. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational_ring.h" @@ -12,7 +12,7 @@ #include "cln/rational.h" #include "cln/rational_io.h" #define zerop zerop_inline -#include "cl_RA.h" +#include "rational/cl_RA.h" #undef zerop namespace cln { diff --git a/src/rational/transcendental/Makeflags b/src/rational/transcendental/Makeflags deleted file mode 100644 index 6ed2160..0000000 --- a/src/rational/transcendental/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/rational/Makeflags -SUBDIR_INCLUDES += diff --git a/src/rational/transcendental/cl_I_logp.cc b/src/rational/transcendental/cl_I_logp.cc index c17c80e..8234aa4 100644 --- a/src/rational/transcendental/cl_I_logp.cc +++ b/src/rational/transcendental/cl_I_logp.cc @@ -1,7 +1,7 @@ // logp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_I.h" -#include "cl_RA.h" -#include "cl_xmacros.h" +#include "integer/cl_I.h" +#include "rational/cl_RA.h" +#include "base/cl_xmacros.h" namespace cln { diff --git a/src/rational/transcendental/cl_RA_logp.cc b/src/rational/transcendental/cl_RA_logp.cc index 84587eb..d5e1de2 100644 --- a/src/rational/transcendental/cl_RA_logp.cc +++ b/src/rational/transcendental/cl_RA_logp.cc @@ -1,7 +1,7 @@ // logp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/rational.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_I.h" -#include "cl_RA.h" +#include "integer/cl_I.h" +#include "rational/cl_RA.h" namespace cln { diff --git a/src/real/Makeflags b/src/real/Makeflags deleted file mode 100644 index 5d5fe4d..0000000 --- a/src/real/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/real -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/real/algebraic/Makeflags b/src/real/algebraic/Makeflags deleted file mode 100644 index 635f2c3..0000000 --- a/src/real/algebraic/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += diff --git a/src/real/algebraic/cl_RA_sqrt.cc b/src/real/algebraic/cl_RA_sqrt.cc index 4b112eb..66bfd65 100644 --- a/src/real/algebraic/cl_RA_sqrt.cc +++ b/src/real/algebraic/cl_RA_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/algebraic/cl_R_sqrt.cc b/src/real/algebraic/cl_R_sqrt.cc index 03bde6a..075ad5c 100644 --- a/src/real/algebraic/cl_R_sqrt.cc +++ b/src/real/algebraic/cl_R_sqrt.cc @@ -1,7 +1,7 @@ // sqrt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/float.h" #include "cln/rational.h" namespace cln { -#include "cl_inline.h" -#include "cl_RA_sqrt.cc" +#include "base/cl_inline.h" +#include "real/algebraic/cl_RA_sqrt.cc" const cl_R sqrt (const cl_R& x) GEN_R_OP1_2(x, sqrt, return) diff --git a/src/real/conv/Makeflags b/src/real/conv/Makeflags deleted file mode 100644 index 635f2c3..0000000 --- a/src/real/conv/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += diff --git a/src/real/conv/cl_F_from_R.cc b/src/real/conv/cl_F_from_R.cc index 54f16a2..d122b24 100644 --- a/src/real/conv/cl_F_from_R.cc +++ b/src/real/conv/cl_F_from_R.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #if 0 @@ -30,8 +30,8 @@ const cl_F cl_float (const cl_R& x, const cl_F& y) #else // less type dispatch overhead -#include "cl_F.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/conv/cl_F_from_R_def.cc b/src/real/conv/cl_F_from_R_def.cc index 63b502f..4e360ea 100644 --- a/src/real/conv/cl_F_from_R_def.cc +++ b/src/real/conv/cl_F_from_R_def.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/conv/cl_F_from_R_f.cc b/src/real/conv/cl_F_from_R_f.cc index 4be26ea..6cf8a3a 100644 --- a/src/real/conv/cl_F_from_R_f.cc +++ b/src/real/conv/cl_F_from_R_f.cc @@ -1,7 +1,7 @@ // cl_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/float.h" -#include "cl_F.h" +#include "float/cl_F.h" namespace cln { diff --git a/src/real/conv/cl_R_to_DF.cc b/src/real/conv/cl_R_to_DF.cc index d6bf57b..ae53de6 100644 --- a/src/real/conv/cl_R_to_DF.cc +++ b/src/real/conv/cl_R_to_DF.cc @@ -1,7 +1,7 @@ // cl_F_to_DF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" -#include "cl_F.h" -#include "cl_DF.h" +#include "real/cl_R.h" +#include "float/cl_F.h" +#include "float/dfloat/cl_DF.h" #if 0 @@ -32,8 +32,8 @@ const cl_DF cl_R_to_DF (const cl_R& x) #else // fully inlined, faster -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/conv/cl_R_to_FF.cc b/src/real/conv/cl_R_to_FF.cc index 71531f9..7bdb09a 100644 --- a/src/real/conv/cl_R_to_FF.cc +++ b/src/real/conv/cl_R_to_FF.cc @@ -1,7 +1,7 @@ // cl_R_to_FF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" -#include "cl_F.h" -#include "cl_FF.h" +#include "real/cl_R.h" +#include "float/cl_F.h" +#include "float/ffloat/cl_FF.h" #if 0 @@ -32,8 +32,8 @@ const cl_FF cl_R_to_FF (const cl_R& x) #else // fully inlined, faster -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/conv/cl_R_to_LF.cc b/src/real/conv/cl_R_to_LF.cc index a4c59c1..a3360e8 100644 --- a/src/real/conv/cl_R_to_LF.cc +++ b/src/real/conv/cl_R_to_LF.cc @@ -1,7 +1,7 @@ // cl_F_to_LF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" -#include "cl_F.h" -#include "cl_LF.h" +#include "real/cl_R.h" +#include "float/cl_F.h" +#include "float/lfloat/cl_LF.h" #if 0 @@ -32,8 +32,8 @@ const cl_LF cl_R_to_LF (const cl_R& x, uintC len) #else // fully inlined, faster -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/conv/cl_R_to_SF.cc b/src/real/conv/cl_R_to_SF.cc index b951ee5..c5acaa0 100644 --- a/src/real/conv/cl_R_to_SF.cc +++ b/src/real/conv/cl_R_to_SF.cc @@ -1,7 +1,7 @@ // cl_R_to_SF(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" -#include "cl_F.h" -#include "cl_SF.h" +#include "real/cl_R.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" #if 0 @@ -32,8 +32,8 @@ const cl_SF cl_R_to_SF (const cl_R& x) #else // fully inlined, faster -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/conv/cl_R_to_double.cc b/src/real/conv/cl_R_to_double.cc index 85e0e00..4c3051b 100644 --- a/src/real/conv/cl_R_to_double.cc +++ b/src/real/conv/cl_R_to_double.cc @@ -1,7 +1,7 @@ // cl_R_to_double(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_F.h" +#include "real/cl_R.h" +#include "float/cl_F.h" #include "cln/integer.h" #include "cln/rational.h" #include "cln/float.h" @@ -38,8 +38,8 @@ double double_approx (const cl_R& x) #else // fully inlined, faster -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/conv/cl_R_to_float.cc b/src/real/conv/cl_R_to_float.cc index f5b852f..9b78dc2 100644 --- a/src/real/conv/cl_R_to_float.cc +++ b/src/real/conv/cl_R_to_float.cc @@ -1,7 +1,7 @@ // cl_R_to_float(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_F.h" +#include "real/cl_R.h" +#include "float/cl_F.h" #include "cln/integer.h" #include "cln/rational.h" #include "cln/float.h" @@ -38,8 +38,8 @@ float float_approx (const cl_R& x) #else // fully inlined, faster -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/division/Makeflags b/src/real/division/Makeflags deleted file mode 100644 index 635f2c3..0000000 --- a/src/real/division/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += diff --git a/src/real/division/cl_R_ceil1.cc b/src/real/division/cl_R_ceil1.cc index 697ad94..668af5c 100644 --- a/src/real/division/cl_R_ceil1.cc +++ b/src/real/division/cl_R_ceil1.cc @@ -1,7 +1,7 @@ // ceiling1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/division/cl_R_ceil12.cc b/src/real/division/cl_R_ceil12.cc index dfc443d..b6b331c 100644 --- a/src/real/division/cl_R_ceil12.cc +++ b/src/real/division/cl_R_ceil12.cc @@ -1,7 +1,7 @@ // ceiling1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" namespace cln { diff --git a/src/real/division/cl_R_ceil2.cc b/src/real/division/cl_R_ceil2.cc index 6ff7546..23f6c15 100644 --- a/src/real/division/cl_R_ceil2.cc +++ b/src/real/division/cl_R_ceil2.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_ceil22.cc b/src/real/division/cl_R_ceil22.cc index c5214b9..167398a 100644 --- a/src/real/division/cl_R_ceil22.cc +++ b/src/real/division/cl_R_ceil22.cc @@ -1,7 +1,7 @@ // ceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_div_t.h b/src/real/division/cl_R_div_t.h index 33db2d7..649e180 100644 --- a/src/real/division/cl_R_div_t.h +++ b/src/real/division/cl_R_div_t.h @@ -4,7 +4,7 @@ #define _CL_R_DIV_T_H #include "cln/real.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/float.h" namespace cln { diff --git a/src/real/division/cl_R_fceil1.cc b/src/real/division/cl_R_fceil1.cc index bb765e1..50a884d 100644 --- a/src/real/division/cl_R_fceil1.cc +++ b/src/real/division/cl_R_fceil1.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_RA.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" diff --git a/src/real/division/cl_R_fceil12.cc b/src/real/division/cl_R_fceil12.cc index 5eede45..6c42a10 100644 --- a/src/real/division/cl_R_fceil12.cc +++ b/src/real/division/cl_R_fceil12.cc @@ -1,7 +1,7 @@ // fceiling(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/division/cl_R_fceil2.cc b/src/real/division/cl_R_fceil2.cc index 4ce2158..17b3d99 100644 --- a/src/real/division/cl_R_fceil2.cc +++ b/src/real/division/cl_R_fceil2.cc @@ -1,7 +1,7 @@ // fceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" #if 0 // 2 type dispatches #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { @@ -38,13 +38,13 @@ const cl_R_fdiv_t fceiling2 (const cl_R& x) #else // 1 type dispatch -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/division/cl_R_fceil22.cc b/src/real/division/cl_R_fceil22.cc index b9781f3..ebbdf2c 100644 --- a/src/real/division/cl_R_fceil22.cc +++ b/src/real/division/cl_R_fceil22.cc @@ -1,7 +1,7 @@ // fceiling2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_ffloor1.cc b/src/real/division/cl_R_ffloor1.cc index a2811d1..af5cf20 100644 --- a/src/real/division/cl_R_ffloor1.cc +++ b/src/real/division/cl_R_ffloor1.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_RA.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" diff --git a/src/real/division/cl_R_ffloor12.cc b/src/real/division/cl_R_ffloor12.cc index a86a6e9..6534977 100644 --- a/src/real/division/cl_R_ffloor12.cc +++ b/src/real/division/cl_R_ffloor12.cc @@ -1,7 +1,7 @@ // ffloor(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/division/cl_R_ffloor2.cc b/src/real/division/cl_R_ffloor2.cc index d6b4a83..e940b7e 100644 --- a/src/real/division/cl_R_ffloor2.cc +++ b/src/real/division/cl_R_ffloor2.cc @@ -1,7 +1,7 @@ // ffloor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" #if 0 // 2 type dispatches #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { @@ -38,13 +38,13 @@ const cl_R_fdiv_t ffloor2 (const cl_R& x) #else // 1 type dispatch -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/division/cl_R_ffloor22.cc b/src/real/division/cl_R_ffloor22.cc index 9590ada..004fb83 100644 --- a/src/real/division/cl_R_ffloor22.cc +++ b/src/real/division/cl_R_ffloor22.cc @@ -1,7 +1,7 @@ // ffloor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_floor1.cc b/src/real/division/cl_R_floor1.cc index 9e90f53..8b36976 100644 --- a/src/real/division/cl_R_floor1.cc +++ b/src/real/division/cl_R_floor1.cc @@ -1,7 +1,7 @@ // floor1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/division/cl_R_floor12.cc b/src/real/division/cl_R_floor12.cc index 6f16994..1e3394d 100644 --- a/src/real/division/cl_R_floor12.cc +++ b/src/real/division/cl_R_floor12.cc @@ -1,7 +1,7 @@ // floor1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" namespace cln { diff --git a/src/real/division/cl_R_floor2.cc b/src/real/division/cl_R_floor2.cc index 4756c58..e005ae9 100644 --- a/src/real/division/cl_R_floor2.cc +++ b/src/real/division/cl_R_floor2.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_floor22.cc b/src/real/division/cl_R_floor22.cc index d1ea8a5..27d86c4 100644 --- a/src/real/division/cl_R_floor22.cc +++ b/src/real/division/cl_R_floor22.cc @@ -1,7 +1,7 @@ // floor2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_fround1.cc b/src/real/division/cl_R_fround1.cc index 7b5ff8d..fe58417 100644 --- a/src/real/division/cl_R_fround1.cc +++ b/src/real/division/cl_R_fround1.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_RA.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" diff --git a/src/real/division/cl_R_fround12.cc b/src/real/division/cl_R_fround12.cc index f3804dc..0b422b0 100644 --- a/src/real/division/cl_R_fround12.cc +++ b/src/real/division/cl_R_fround12.cc @@ -1,7 +1,7 @@ // fround(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/division/cl_R_fround2.cc b/src/real/division/cl_R_fround2.cc index 641e044..e58224c 100644 --- a/src/real/division/cl_R_fround2.cc +++ b/src/real/division/cl_R_fround2.cc @@ -1,7 +1,7 @@ // fround2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" #if 0 // 2 type dispatches #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { @@ -38,13 +38,13 @@ const cl_R_fdiv_t fround2 (const cl_R& x) #else // 1 type dispatch -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/division/cl_R_fround22.cc b/src/real/division/cl_R_fround22.cc index 255324d..f0e1fd2 100644 --- a/src/real/division/cl_R_fround22.cc +++ b/src/real/division/cl_R_fround22.cc @@ -1,7 +1,7 @@ // fround2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_ftrunc1.cc b/src/real/division/cl_R_ftrunc1.cc index d3ffc55..60cd029 100644 --- a/src/real/division/cl_R_ftrunc1.cc +++ b/src/real/division/cl_R_ftrunc1.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_RA.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" diff --git a/src/real/division/cl_R_ftrunc12.cc b/src/real/division/cl_R_ftrunc12.cc index 2aa9c66..6732870 100644 --- a/src/real/division/cl_R_ftrunc12.cc +++ b/src/real/division/cl_R_ftrunc12.cc @@ -1,7 +1,7 @@ // ftruncate(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/division/cl_R_ftrunc2.cc b/src/real/division/cl_R_ftrunc2.cc index 32fdc4b..1c57766 100644 --- a/src/real/division/cl_R_ftrunc2.cc +++ b/src/real/division/cl_R_ftrunc2.cc @@ -1,7 +1,7 @@ // ftruncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,14 +9,14 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" #if 0 // 2 type dispatches #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { @@ -38,13 +38,13 @@ const cl_R_fdiv_t ftruncate2 (const cl_R& x) #else // 1 type dispatch -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" #include "cln/sfloat.h" #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/division/cl_R_ftrunc22.cc b/src/real/division/cl_R_ftrunc22.cc index 0213a0a..28696ef 100644 --- a/src/real/division/cl_R_ftrunc22.cc +++ b/src/real/division/cl_R_ftrunc22.cc @@ -1,7 +1,7 @@ // ftruncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_R_div_t.h" +#include "real/cl_R.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_mod.cc b/src/real/division/cl_R_mod.cc index 14b4b6e..2841cda 100644 --- a/src/real/division/cl_R_mod.cc +++ b/src/real/division/cl_R_mod.cc @@ -1,7 +1,7 @@ // mod(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/integer.h" namespace cln { diff --git a/src/real/division/cl_R_rem.cc b/src/real/division/cl_R_rem.cc index 3a4ecce..cdb135d 100644 --- a/src/real/division/cl_R_rem.cc +++ b/src/real/division/cl_R_rem.cc @@ -1,7 +1,7 @@ // rem(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/integer.h" namespace cln { diff --git a/src/real/division/cl_R_round1.cc b/src/real/division/cl_R_round1.cc index 8f0d992..04d076c 100644 --- a/src/real/division/cl_R_round1.cc +++ b/src/real/division/cl_R_round1.cc @@ -1,7 +1,7 @@ // round1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/division/cl_R_round12.cc b/src/real/division/cl_R_round12.cc index 34ec994..baa2c74 100644 --- a/src/real/division/cl_R_round12.cc +++ b/src/real/division/cl_R_round12.cc @@ -1,7 +1,7 @@ // round1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" namespace cln { diff --git a/src/real/division/cl_R_round2.cc b/src/real/division/cl_R_round2.cc index c88355e..99590dd 100644 --- a/src/real/division/cl_R_round2.cc +++ b/src/real/division/cl_R_round2.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_round22.cc b/src/real/division/cl_R_round22.cc index ef3b544..f3e7731 100644 --- a/src/real/division/cl_R_round22.cc +++ b/src/real/division/cl_R_round22.cc @@ -1,7 +1,7 @@ // round2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_trunc1.cc b/src/real/division/cl_R_trunc1.cc index 31ceefa..bf4e217 100644 --- a/src/real/division/cl_R_trunc1.cc +++ b/src/real/division/cl_R_trunc1.cc @@ -1,7 +1,7 @@ // truncate1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/division/cl_R_trunc12.cc b/src/real/division/cl_R_trunc12.cc index 8180a00..f2f08c9 100644 --- a/src/real/division/cl_R_trunc12.cc +++ b/src/real/division/cl_R_trunc12.cc @@ -1,7 +1,7 @@ // truncate1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" namespace cln { diff --git a/src/real/division/cl_R_trunc2.cc b/src/real/division/cl_R_trunc2.cc index ba0f6e5..f11eb0f 100644 --- a/src/real/division/cl_R_trunc2.cc +++ b/src/real/division/cl_R_trunc2.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/division/cl_R_trunc22.cc b/src/real/division/cl_R_trunc22.cc index 304876e..330714e 100644 --- a/src/real/division/cl_R_trunc22.cc +++ b/src/real/division/cl_R_trunc22.cc @@ -1,7 +1,7 @@ // truncate2(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,9 +9,9 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_R_div_t.h" +#include "real/division/cl_R_div_t.h" namespace cln { diff --git a/src/real/elem/Makeflags b/src/real/elem/Makeflags deleted file mode 100644 index 75f2dff..0000000 --- a/src/real/elem/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/lfloat/elem diff --git a/src/real/elem/cl_R_compare.cc b/src/real/elem/cl_R_compare.cc index b881c1d..dfe593b 100644 --- a/src/real/elem/cl_R_compare.cc +++ b/src/real/elem/cl_R_compare.cc @@ -1,7 +1,7 @@ // compare(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/elem/cl_R_div.cc b/src/real/elem/cl_R_div.cc index 546c30a..fd0b951 100644 --- a/src/real/elem/cl_R_div.cc +++ b/src/real/elem/cl_R_div.cc @@ -1,7 +1,7 @@ // binary operator / // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,21 +9,21 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" #include "cln/sfloat.h" -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" #include "cln/ffloat.h" -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" #include "cln/dfloat.h" -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" #include "cln/lfloat.h" -#include "cl_LF.h" -#include "cl_N.h" +#include "float/lfloat/cl_LF.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/real/elem/cl_R_equal.cc b/src/real/elem/cl_R_equal.cc index bc35397..bac49a0 100644 --- a/src/real/elem/cl_R_equal.cc +++ b/src/real/elem/cl_R_equal.cc @@ -1,7 +1,7 @@ // equal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_RA.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" #include "cln/integer.h" namespace cln { diff --git a/src/real/elem/cl_R_minus.cc b/src/real/elem/cl_R_minus.cc index 3e89c6f..801665e 100644 --- a/src/real/elem/cl_R_minus.cc +++ b/src/real/elem/cl_R_minus.cc @@ -1,7 +1,7 @@ // binary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/elem/cl_R_minus1.cc b/src/real/elem/cl_R_minus1.cc index 0b796b5..f5933f6 100644 --- a/src/real/elem/cl_R_minus1.cc +++ b/src/real/elem/cl_R_minus1.cc @@ -1,7 +1,7 @@ // minus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/elem/cl_R_minusp.cc b/src/real/elem/cl_R_minusp.cc index 9fe30bf..20326ed 100644 --- a/src/real/elem/cl_R_minusp.cc +++ b/src/real/elem/cl_R_minusp.cc @@ -1,7 +1,7 @@ // minusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,18 +9,18 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #define minusp minusp_inline -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" #undef minusp -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_minusp.cc" -#include "cl_FF_minusp.cc" -#include "cl_DF_minusp.cc" -#include "cl_LF_minusp.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_minusp.cc" +#include "float/ffloat/elem/cl_FF_minusp.cc" +#include "float/dfloat/elem/cl_DF_minusp.cc" +#include "float/lfloat/elem/cl_LF_minusp.cc" namespace cln { diff --git a/src/real/elem/cl_R_mul.cc b/src/real/elem/cl_R_mul.cc index 3c1ac8e..4fe1e96 100644 --- a/src/real/elem/cl_R_mul.cc +++ b/src/real/elem/cl_R_mul.cc @@ -1,7 +1,7 @@ // binary operator * // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,21 +9,21 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" -#include "cl_RA.h" +#include "rational/cl_RA.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" #include "cln/sfloat.h" -#include "cl_SF.h" +#include "float/sfloat/cl_SF.h" #include "cln/ffloat.h" -#include "cl_FF.h" +#include "float/ffloat/cl_FF.h" #include "cln/dfloat.h" -#include "cl_DF.h" +#include "float/dfloat/cl_DF.h" #include "cln/lfloat.h" -#include "cl_LF.h" -#include "cl_N.h" +#include "float/lfloat/cl_LF.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/real/elem/cl_R_plus.cc b/src/real/elem/cl_R_plus.cc index 021b792..908f585 100644 --- a/src/real/elem/cl_R_plus.cc +++ b/src/real/elem/cl_R_plus.cc @@ -1,7 +1,7 @@ // binary operator + // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/elem/cl_R_plus1.cc b/src/real/elem/cl_R_plus1.cc index 86ed49f..31edf62 100644 --- a/src/real/elem/cl_R_plus1.cc +++ b/src/real/elem/cl_R_plus1.cc @@ -1,7 +1,7 @@ // plus1(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/elem/cl_R_plusp.cc b/src/real/elem/cl_R_plusp.cc index ab8e274..192912c 100644 --- a/src/real/elem/cl_R_plusp.cc +++ b/src/real/elem/cl_R_plusp.cc @@ -1,7 +1,7 @@ // plusp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/elem/cl_R_recip.cc b/src/real/elem/cl_R_recip.cc index 424c417..29c00c6 100644 --- a/src/real/elem/cl_R_recip.cc +++ b/src/real/elem/cl_R_recip.cc @@ -1,7 +1,7 @@ // recip(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/elem/cl_R_square.cc b/src/real/elem/cl_R_square.cc index 865b8f9..c9f23be 100644 --- a/src/real/elem/cl_R_square.cc +++ b/src/real/elem/cl_R_square.cc @@ -1,7 +1,7 @@ // square(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/integer.h" #include "cln/float.h" @@ -17,8 +17,8 @@ #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/elem/cl_R_uminus.cc b/src/real/elem/cl_R_uminus.cc index c003ca9..1f339b3 100644 --- a/src/real/elem/cl_R_uminus.cc +++ b/src/real/elem/cl_R_uminus.cc @@ -1,7 +1,7 @@ // unary operator - // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/integer.h" #include "cln/float.h" @@ -17,8 +17,8 @@ #include "cln/ffloat.h" #include "cln/dfloat.h" #include "cln/lfloat.h" -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/elem/cl_R_zerop.cc b/src/real/elem/cl_R_zerop.cc index c300b7e..0a077c9 100644 --- a/src/real/elem/cl_R_zerop.cc +++ b/src/real/elem/cl_R_zerop.cc @@ -1,7 +1,7 @@ // zerop(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,17 +10,17 @@ // Implementation. #define zerop zerop_inline -#include "cl_R.h" -#include "cl_RA.h" -#include "cl_I.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" #undef zerop -#include "cl_F.h" +#include "float/cl_F.h" -#include "cl_inline.h" -#include "cl_SF_zerop.cc" -#include "cl_FF_zerop.cc" -#include "cl_DF_zerop.cc" -#include "cl_LF_zerop.cc" +#include "base/cl_inline.h" +#include "float/sfloat/elem/cl_SF_zerop.cc" +#include "float/ffloat/elem/cl_FF_zerop.cc" +#include "float/dfloat/elem/cl_DF_zerop.cc" +#include "float/lfloat/elem/cl_LF_zerop.cc" namespace cln { diff --git a/src/real/format-output/Makeflags b/src/real/format-output/Makeflags deleted file mode 100644 index cd9512e..0000000 --- a/src/real/format-output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/string diff --git a/src/real/format-output/cl_fmt_cardinal.cc b/src/real/format-output/cl_fmt_cardinal.cc index 9d4a426..0103b62 100644 --- a/src/real/format-output/cl_fmt_cardinal.cc +++ b/src/real/format-output/cl_fmt_cardinal.cc @@ -1,10 +1,10 @@ // format_cardinal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. diff --git a/src/real/format-output/cl_fmt_floatstring.cc b/src/real/format-output/cl_fmt_floatstring.cc index dbcc2c1..88acc3e 100644 --- a/src/real/format-output/cl_fmt_floatstring.cc +++ b/src/real/format-output/cl_fmt_floatstring.cc @@ -1,10 +1,10 @@ // format_float_to_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. @@ -16,8 +16,8 @@ #include "cln/malloc.h" #include "cln/float.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_spushstring.h" +#include "integer/cl_I.h" +#include "base/string/cl_spushstring.h" namespace cln { diff --git a/src/real/format-output/cl_fmt_integer.cc b/src/real/format-output/cl_fmt_integer.cc index 0f50610..f98138b 100644 --- a/src/real/format-output/cl_fmt_integer.cc +++ b/src/real/format-output/cl_fmt_integer.cc @@ -1,17 +1,17 @@ // format_integer(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. #include "cln/integer_io.h" #include -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/format-output/cl_fmt_newroman.cc b/src/real/format-output/cl_fmt_newroman.cc index 63e94d5..c8753cb 100644 --- a/src/real/format-output/cl_fmt_newroman.cc +++ b/src/real/format-output/cl_fmt_newroman.cc @@ -1,10 +1,10 @@ // format_new_roman(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. diff --git a/src/real/format-output/cl_fmt_oldroman.cc b/src/real/format-output/cl_fmt_oldroman.cc index 9ca5c6f..902843d 100644 --- a/src/real/format-output/cl_fmt_oldroman.cc +++ b/src/real/format-output/cl_fmt_oldroman.cc @@ -1,10 +1,10 @@ // format_old_roman(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. diff --git a/src/real/format-output/cl_fmt_ordinal.cc b/src/real/format-output/cl_fmt_ordinal.cc index 9e4c299..dd110d3 100644 --- a/src/real/format-output/cl_fmt_ordinal.cc +++ b/src/real/format-output/cl_fmt_ordinal.cc @@ -1,10 +1,10 @@ // format_ordinal(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. diff --git a/src/real/format-output/cl_fmt_paddedstring.cc b/src/real/format-output/cl_fmt_paddedstring.cc index 20b0b39..1557149 100644 --- a/src/real/format-output/cl_fmt_paddedstring.cc +++ b/src/real/format-output/cl_fmt_paddedstring.cc @@ -1,10 +1,10 @@ // format_padded_string(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. diff --git a/src/real/format-output/cl_fmt_scaleexp.cc b/src/real/format-output/cl_fmt_scaleexp.cc index f982a18..2df3832 100644 --- a/src/real/format-output/cl_fmt_scaleexp.cc +++ b/src/real/format-output/cl_fmt_scaleexp.cc @@ -1,10 +1,10 @@ // format_scale_exponent(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. @@ -12,11 +12,11 @@ #include "cln/real.h" #include "cln/integer.h" #include "cln/float.h" -#include "cl_F.h" -#include "cl_SF.h" -#include "cl_FF.h" -#include "cl_DF.h" -#include "cl_LF.h" +#include "float/cl_F.h" +#include "float/sfloat/cl_SF.h" +#include "float/ffloat/cl_FF.h" +#include "float/dfloat/cl_DF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/format-output/cl_fmt_tens.cc b/src/real/format-output/cl_fmt_tens.cc index 5206962..d0faf8a 100644 --- a/src/real/format-output/cl_fmt_tens.cc +++ b/src/real/format-output/cl_fmt_tens.cc @@ -1,10 +1,10 @@ // cl_format_tens. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_format.h" +#include "real/format-output/cl_format.h" // Implementation. diff --git a/src/real/input/Makeflags b/src/real/input/Makeflags deleted file mode 100644 index cd9512e..0000000 --- a/src/real/input/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/string diff --git a/src/real/input/cl_R_from_string.cc b/src/real/input/cl_R_from_string.cc index 346530e..f61d3fb 100644 --- a/src/real/input/cl_R_from_string.cc +++ b/src/real/input/cl_R_from_string.cc @@ -1,7 +1,7 @@ // cl_R (const char *) constructor. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_class.h" diff --git a/src/real/input/cl_R_read.cc b/src/real/input/cl_R_read.cc index f0e77bb..3d39050 100644 --- a/src/real/input/cl_R_read.cc +++ b/src/real/input/cl_R_read.cc @@ -3,7 +3,7 @@ // It does not pull in all the complex function code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_io.h" @@ -18,8 +18,8 @@ #include "cln/integer_io.h" #include "cln/float_io.h" #include "cln/integer.h" -#include "cl_I.h" -#include "cl_F.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" #include "cln/exception.h" #undef floor diff --git a/src/real/input/cl_R_read_stream.cc b/src/real/input/cl_R_read_stream.cc index 8415c15..873bad7 100644 --- a/src/real/input/cl_R_read_stream.cc +++ b/src/real/input/cl_R_read_stream.cc @@ -3,7 +3,7 @@ // It does not pull in all the complex function code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_io.h" @@ -12,7 +12,7 @@ // Implementation. #include "cln/io.h" -#include "cl_spushstring.h" +#include "base/string/cl_spushstring.h" #include "cln/input.h" namespace cln { diff --git a/src/real/misc/Makeflags b/src/real/misc/Makeflags deleted file mode 100644 index 0e9a378..0000000 --- a/src/real/misc/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/sfloat/misc -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/ffloat/misc -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/dfloat/misc -I$(srcdir)/float/lfloat/elem -I$(srcdir)/float/lfloat/misc -I$(srcdir)/rational/misc -I$(srcdir)/integer/misc diff --git a/src/real/misc/cl_R_abs.cc b/src/real/misc/cl_R_abs.cc index 745311f..9a1e178 100644 --- a/src/real/misc/cl_R_abs.cc +++ b/src/real/misc/cl_R_abs.cc @@ -1,7 +1,7 @@ // abs(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/misc/cl_R_as.cc b/src/real/misc/cl_R_as.cc index cb0824a..17ce613 100644 --- a/src/real/misc/cl_R_as.cc +++ b/src/real/misc/cl_R_as.cc @@ -1,7 +1,7 @@ // cl_R_As(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_N.h" +#include "base/cl_N.h" namespace cln { diff --git a/src/real/misc/cl_R_contagion.cc b/src/real/misc/cl_R_contagion.cc index 77d7b36..7a8a488 100644 --- a/src/real/misc/cl_R_contagion.cc +++ b/src/real/misc/cl_R_contagion.cc @@ -1,15 +1,15 @@ // contagion(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_R.h" +#include "real/cl_R.h" // Implementation. -#include "cl_LF.h" +#include "float/lfloat/cl_LF.h" namespace cln { diff --git a/src/real/misc/cl_R_debug.cc b/src/real/misc/cl_R_debug.cc index 62d20bc..d207fd4 100644 --- a/src/real/misc/cl_R_debug.cc +++ b/src/real/misc/cl_R_debug.cc @@ -1,7 +1,7 @@ // cl_R debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/real/misc/cl_R_eqhashcode.cc b/src/real/misc/cl_R_eqhashcode.cc index 24dba5b..c4c058e 100644 --- a/src/real/misc/cl_R_eqhashcode.cc +++ b/src/real/misc/cl_R_eqhashcode.cc @@ -1,7 +1,7 @@ // cl_R equal_hashcode(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,19 +9,19 @@ // Implementation. -#include "cl_N.h" -#include "cl_R.h" -#include "cl_RA.h" -#include "cl_I.h" -#include "cl_F.h" - -#include "cl_inline.h" -#include "cl_SF_eqhashcode.cc" -#include "cl_FF_eqhashcode.cc" -#include "cl_DF_eqhashcode.cc" -#include "cl_LF_eqhashcode.cc" -#include "cl_inline2.h" -#include "cl_RA_eqhashcode.cc" +#include "base/cl_N.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" + +#include "base/cl_inline.h" +#include "float/sfloat/misc/cl_SF_eqhashcode.cc" +#include "float/ffloat/misc/cl_FF_eqhashcode.cc" +#include "float/dfloat/misc/cl_DF_eqhashcode.cc" +#include "float/lfloat/misc/cl_LF_eqhashcode.cc" +#include "base/cl_inline2.h" +#include "rational/misc/cl_RA_eqhashcode.cc" namespace cln { diff --git a/src/real/misc/cl_R_expt.cc b/src/real/misc/cl_R_expt.cc index 7a6afc3..34f5b19 100644 --- a/src/real/misc/cl_R_expt.cc +++ b/src/real/misc/cl_R_expt.cc @@ -1,7 +1,7 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/integer.h" diff --git a/src/real/misc/cl_R_expt_I.cc b/src/real/misc/cl_R_expt_I.cc index 2bbeec2..f8e5e5d 100644 --- a/src/real/misc/cl_R_expt_I.cc +++ b/src/real/misc/cl_R_expt_I.cc @@ -1,7 +1,7 @@ // expt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/integer.h" -#include "cl_I.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/misc/cl_R_max.cc b/src/real/misc/cl_R_max.cc index 8560709..2c950bd 100644 --- a/src/real/misc/cl_R_max.cc +++ b/src/real/misc/cl_R_max.cc @@ -1,7 +1,7 @@ // max(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/misc/cl_R_min.cc b/src/real/misc/cl_R_min.cc index 892a029..b152ccb 100644 --- a/src/real/misc/cl_R_min.cc +++ b/src/real/misc/cl_R_min.cc @@ -1,7 +1,7 @@ // min(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/misc/cl_R_rational.cc b/src/real/misc/cl_R_rational.cc index ce81730..db2ab5c 100644 --- a/src/real/misc/cl_R_rational.cc +++ b/src/real/misc/cl_R_rational.cc @@ -1,7 +1,7 @@ // rational(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/misc/cl_R_rationalize.cc b/src/real/misc/cl_R_rationalize.cc index 4112d28..835c4b9 100644 --- a/src/real/misc/cl_R_rationalize.cc +++ b/src/real/misc/cl_R_rationalize.cc @@ -1,7 +1,7 @@ // rationalize(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,12 +9,12 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/float.h" #include "cln/rational.h" #include "cln/integer.h" -#include "cl_RA.h" -#include "cl_I.h" +#include "rational/cl_RA.h" +#include "integer/cl_I.h" namespace cln { diff --git a/src/real/misc/cl_R_signum.cc b/src/real/misc/cl_R_signum.cc index eb753c3..a8ec03f 100644 --- a/src/real/misc/cl_R_signum.cc +++ b/src/real/misc/cl_R_signum.cc @@ -1,7 +1,7 @@ // signum(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,18 +9,18 @@ // Implementation. -#include "cl_R.h" +#include "real/cl_R.h" /* use inline versions of zerop */ -#include "cl_inline.h" -#include "cl_I_signum.cc" -#include "cl_RA_signum.cc" +#include "base/cl_inline.h" +#include "integer/misc/cl_I_signum.cc" +#include "rational/misc/cl_RA_signum.cc" /* use inline versions of signum */ -#include "cl_inline2.h" -#include "cl_SF_signum.cc" -#include "cl_FF_signum.cc" -#include "cl_DF_signum.cc" -#include "cl_LF_signum.cc" +#include "base/cl_inline2.h" +#include "float/sfloat/misc/cl_SF_signum.cc" +#include "float/ffloat/misc/cl_FF_signum.cc" +#include "float/dfloat/misc/cl_DF_signum.cc" +#include "float/lfloat/misc/cl_LF_signum.cc" namespace cln { diff --git a/src/real/output/Makeflags b/src/real/output/Makeflags deleted file mode 100644 index 635f2c3..0000000 --- a/src/real/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += diff --git a/src/real/output/cl_R_aprint.cc b/src/real/output/cl_R_aprint.cc index 23f2ef9..f92db6c 100644 --- a/src/real/output/cl_R_aprint.cc +++ b/src/real/output/cl_R_aprint.cc @@ -1,7 +1,7 @@ // print_real(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_io.h" diff --git a/src/real/output/cl_R_bprint.cc b/src/real/output/cl_R_bprint.cc index a676d41..16f70de 100644 --- a/src/real/output/cl_R_bprint.cc +++ b/src/real/output/cl_R_bprint.cc @@ -1,7 +1,7 @@ // print_real(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_io.h" diff --git a/src/real/output/cl_R_cprint.cc b/src/real/output/cl_R_cprint.cc index 34ee0c1..bb61c9b 100644 --- a/src/real/output/cl_R_cprint.cc +++ b/src/real/output/cl_R_cprint.cc @@ -1,7 +1,7 @@ // print_real(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_io.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/rational_io.h" #include "cln/float_io.h" diff --git a/src/real/random/Makeflags b/src/real/random/Makeflags deleted file mode 100644 index 635f2c3..0000000 --- a/src/real/random/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += diff --git a/src/real/random/cl_R_random.cc b/src/real/random/cl_R_random.cc index f81143c..58629b6 100644 --- a/src/real/random/cl_R_random.cc +++ b/src/real/random/cl_R_random.cc @@ -1,7 +1,7 @@ // random_R(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_R.h" -#include "cl_RA.h" +#include "real/cl_R.h" +#include "rational/cl_RA.h" #include "cln/io.h" #include "cln/real_io.h" #include "cln/exception.h" diff --git a/src/real/ring/Makeflags b/src/real/ring/Makeflags deleted file mode 100644 index 635f2c3..0000000 --- a/src/real/ring/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += diff --git a/src/real/ring/cl_R_ring.cc b/src/real/ring/cl_R_ring.cc index 7dbdeaf..d733a97 100644 --- a/src/real/ring/cl_R_ring.cc +++ b/src/real/ring/cl_R_ring.cc @@ -1,7 +1,7 @@ // Ring of real numbers. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real_ring.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/real.h" -#include "cl_R.h" +#include "real/cl_R.h" #include "cln/io.h" #include "cln/real_io.h" diff --git a/src/real/transcendental/Makeflags b/src/real/transcendental/Makeflags deleted file mode 100644 index ceec96e..0000000 --- a/src/real/transcendental/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/real/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/transcendental diff --git a/src/real/transcendental/cl_R_atan.cc b/src/real/transcendental/cl_R_atan.cc index 4042f22..d33ed0c 100644 --- a/src/real/transcendental/cl_R_atan.cc +++ b/src/real/transcendental/cl_R_atan.cc @@ -1,7 +1,7 @@ // atan(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/transcendental/cl_R_atan2.cc b/src/real/transcendental/cl_R_atan2.cc index 36b4169..d22281c 100644 --- a/src/real/transcendental/cl_R_atan2.cc +++ b/src/real/transcendental/cl_R_atan2.cc @@ -1,7 +1,7 @@ // atan(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,9 +10,9 @@ // Implementation. #include "cln/float.h" -#include "cl_F_tran.h" -#include "cl_N.h" -#include "cl_R.h" +#include "float/transcendental/cl_F_tran.h" +#include "base/cl_N.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_cos.cc b/src/real/transcendental/cl_R_cos.cc index 236304f..28aeb38 100644 --- a/src/real/transcendental/cl_R_cos.cc +++ b/src/real/transcendental/cl_R_cos.cc @@ -1,7 +1,7 @@ // cos(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_cosh.cc b/src/real/transcendental/cl_R_cosh.cc index 9dc0c8a..b4b57b1 100644 --- a/src/real/transcendental/cl_R_cosh.cc +++ b/src/real/transcendental/cl_R_cosh.cc @@ -1,7 +1,7 @@ // cosh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_coshsinh.cc b/src/real/transcendental/cl_R_coshsinh.cc index 12fbb18..3339549 100644 --- a/src/real/transcendental/cl_R_coshsinh.cc +++ b/src/real/transcendental/cl_R_coshsinh.cc @@ -1,7 +1,7 @@ // cosh_sinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_cossin.cc b/src/real/transcendental/cl_R_cossin.cc index 8893f71..76eb5df 100644 --- a/src/real/transcendental/cl_R_cossin.cc +++ b/src/real/transcendental/cl_R_cossin.cc @@ -1,7 +1,7 @@ // cos_sin(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_exp.cc b/src/real/transcendental/cl_R_exp.cc index 4babcb9..a7ab420 100644 --- a/src/real/transcendental/cl_R_exp.cc +++ b/src/real/transcendental/cl_R_exp.cc @@ -1,7 +1,7 @@ // exp(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_ln.cc b/src/real/transcendental/cl_R_ln.cc index 39c3943..e5bdd83 100644 --- a/src/real/transcendental/cl_R_ln.cc +++ b/src/real/transcendental/cl_R_ln.cc @@ -1,7 +1,7 @@ // ln(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_log.cc b/src/real/transcendental/cl_R_log.cc index 00d42fe..4623b74 100644 --- a/src/real/transcendental/cl_R_log.cc +++ b/src/real/transcendental/cl_R_log.cc @@ -1,7 +1,7 @@ // log(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -9,8 +9,8 @@ // Implementation. -#include "cl_N.h" -#include "cl_R.h" +#include "base/cl_N.h" +#include "real/cl_R.h" #include "cln/rational.h" #include "cln/float.h" diff --git a/src/real/transcendental/cl_R_sin.cc b/src/real/transcendental/cl_R_sin.cc index 35c0947..63d7c5e 100644 --- a/src/real/transcendental/cl_R_sin.cc +++ b/src/real/transcendental/cl_R_sin.cc @@ -1,7 +1,7 @@ // sin(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_sinh.cc b/src/real/transcendental/cl_R_sinh.cc index af9e7ba..dcf6017 100644 --- a/src/real/transcendental/cl_R_sinh.cc +++ b/src/real/transcendental/cl_R_sinh.cc @@ -1,7 +1,7 @@ // sinh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/float.h" -#include "cl_R.h" +#include "real/cl_R.h" namespace cln { diff --git a/src/real/transcendental/cl_R_tan.cc b/src/real/transcendental/cl_R_tan.cc index 5a5f606..f254b00 100644 --- a/src/real/transcendental/cl_R_tan.cc +++ b/src/real/transcendental/cl_R_tan.cc @@ -1,7 +1,7 @@ // tan(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/real/transcendental/cl_R_tanh.cc b/src/real/transcendental/cl_R_tanh.cc index 4bca3b9..d8557ce 100644 --- a/src/real/transcendental/cl_R_tanh.cc +++ b/src/real/transcendental/cl_R_tanh.cc @@ -1,7 +1,7 @@ // tanh(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/real.h" diff --git a/src/timing/Makeflags b/src/timing/Makeflags deleted file mode 100644 index 43f15e5..0000000 --- a/src/timing/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/base -Itiming diff --git a/src/timing/cl_t_c1.cc b/src/timing/cl_t_c1.cc index 3007748..05f706e 100644 --- a/src/timing/cl_t_c1.cc +++ b/src/timing/cl_t_c1.cc @@ -1,7 +1,7 @@ // constructor cl_timing(cl_time_consumption&). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_c2.cc b/src/timing/cl_t_c2.cc index e487d72..2ce09c3 100644 --- a/src/timing/cl_t_c2.cc +++ b/src/timing/cl_t_c2.cc @@ -1,7 +1,7 @@ // constructor cl_timing(std::ostream&). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_current.cc b/src/timing/cl_t_current.cc index ee05dae..aa5d3b1 100644 --- a/src/timing/cl_t_current.cc +++ b/src/timing/cl_t_current.cc @@ -1,7 +1,7 @@ // cl_current_time(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_t_config.h" +#include "timing/cl_t_config.h" #if defined(HAVE_GETTIMEOFDAY) diff --git a/src/timing/cl_t_current2.cc b/src/timing/cl_t_current2.cc index 904a738..085a24e 100644 --- a/src/timing/cl_t_current2.cc +++ b/src/timing/cl_t_current2.cc @@ -1,7 +1,7 @@ // cl_current_time_consumption(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" @@ -9,7 +9,7 @@ // Implementation. -#include "cl_t_config.h" +#include "timing/cl_t_config.h" #if defined(HAVE_GETRUSAGE) #include diff --git a/src/timing/cl_t_d.cc b/src/timing/cl_t_d.cc index 6f4716e..4eeacb7 100644 --- a/src/timing/cl_t_d.cc +++ b/src/timing/cl_t_d.cc @@ -1,7 +1,7 @@ // destructor ~cl_timing(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_dec.cc b/src/timing/cl_t_dec.cc index 4791bd5..aa0e123 100644 --- a/src/timing/cl_t_dec.cc +++ b/src/timing/cl_t_dec.cc @@ -1,7 +1,7 @@ // operator- (const cl_timespec&, const cl_time_duration&) // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_inc.cc b/src/timing/cl_t_inc.cc index 980275b..4b6c367 100644 --- a/src/timing/cl_t_inc.cc +++ b/src/timing/cl_t_inc.cc @@ -1,7 +1,7 @@ // operator+ (const cl_timespec&, const cl_time_duration&) // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_minus.cc b/src/timing/cl_t_minus.cc index b9da896..cad98b5 100644 --- a/src/timing/cl_t_minus.cc +++ b/src/timing/cl_t_minus.cc @@ -1,7 +1,7 @@ // operator- (const cl_timespec&, const cl_timespec&) // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_report.cc b/src/timing/cl_t_report.cc index 1ffed47..b5c551b 100644 --- a/src/timing/cl_t_report.cc +++ b/src/timing/cl_t_report.cc @@ -1,7 +1,7 @@ // cl_timing_report(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_td_minus.cc b/src/timing/cl_t_td_minus.cc index 920da0c..e84d71e 100644 --- a/src/timing/cl_t_td_minus.cc +++ b/src/timing/cl_t_td_minus.cc @@ -1,7 +1,7 @@ // operator- (const cl_time_duration&, const cl_time_duration&) // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/timing/cl_t_td_plus.cc b/src/timing/cl_t_td_plus.cc index c118108..2082208 100644 --- a/src/timing/cl_t_td_plus.cc +++ b/src/timing/cl_t_td_plus.cc @@ -1,7 +1,7 @@ // operator+ (const cl_time_duration&, const cl_time_duration&) // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/timing.h" diff --git a/src/vector/Makeflags b/src/vector/Makeflags deleted file mode 100644 index 8efa95a..0000000 --- a/src/vector/Makeflags +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains additional flags for the main Makefile. - -SUBDIR_INCLUDES = -I$(srcdir)/vector -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/vector/cl_GV_I.cc b/src/vector/cl_GV_I.cc index 4b46fa6..4162d68 100644 --- a/src/vector/cl_GV_I.cc +++ b/src/vector/cl_GV_I.cc @@ -1,7 +1,7 @@ // cl_make_heap_GV_I(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/GV_integer.h" @@ -9,10 +9,10 @@ // Implementation. -#include "cl_I.h" -#include "cl_DS.h" +#include "integer/cl_I.h" +#include "base/digitseq/cl_DS.h" #include "cln/exception.h" -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/vector/cl_GV_I_copy.cc b/src/vector/cl_GV_I_copy.cc index 8a0533b..5753cbc 100644 --- a/src/vector/cl_GV_I_copy.cc +++ b/src/vector/cl_GV_I_copy.cc @@ -1,7 +1,7 @@ // copy(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #define CL_GV_NO_RANGECHECKS diff --git a/src/vector/cl_GV_I_debug.cc b/src/vector/cl_GV_I_debug.cc index f291f39..4cd5b36 100644 --- a/src/vector/cl_GV_I_debug.cc +++ b/src/vector/cl_GV_I_debug.cc @@ -1,7 +1,7 @@ // cl_GV_I debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/vector/cl_GV_number.cc b/src/vector/cl_GV_number.cc index 6c47891..bdbc84e 100644 --- a/src/vector/cl_GV_number.cc +++ b/src/vector/cl_GV_number.cc @@ -1,7 +1,7 @@ // cl_make_heap_GV_number(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/GV_number.h" @@ -10,7 +10,7 @@ // Implementation. #include "cln/exception.h" -#include "cl_offsetof.h" +#include "base/cl_offsetof.h" namespace cln { diff --git a/src/vector/cl_GV_number_copy.cc b/src/vector/cl_GV_number_copy.cc index 3164f2a..64b82a3 100644 --- a/src/vector/cl_GV_number_copy.cc +++ b/src/vector/cl_GV_number_copy.cc @@ -1,7 +1,7 @@ // copy(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #define CL_GV_NO_RANGECHECKS diff --git a/src/vector/cl_GV_number_debug.cc b/src/vector/cl_GV_number_debug.cc index 3c24bb7..2ceb5b4 100644 --- a/src/vector/cl_GV_number_debug.cc +++ b/src/vector/cl_GV_number_debug.cc @@ -1,7 +1,7 @@ // cl_GV_number debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. @@ -11,7 +11,7 @@ #include "cln/output.h" #include "cln/GV_number.h" #include "cln/io.h" -#include "cl_GV_io.h" +#include "vector/cl_GV_io.h" namespace cln { diff --git a/src/vector/cl_SV_copy.cc b/src/vector/cl_SV_copy.cc index 45690fa..4b9dcbb 100644 --- a/src/vector/cl_SV_copy.cc +++ b/src/vector/cl_SV_copy.cc @@ -1,7 +1,7 @@ // copy(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #define CL_SV_NO_RANGECHECKS diff --git a/src/vector/cl_SV_number.cc b/src/vector/cl_SV_number.cc index 87e45c6..80b99b0 100644 --- a/src/vector/cl_SV_number.cc +++ b/src/vector/cl_SV_number.cc @@ -1,7 +1,7 @@ // cl_make_heap_SV_number(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/SV_number.h" diff --git a/src/vector/cl_SV_number_debug.cc b/src/vector/cl_SV_number_debug.cc index bd1aede..cec65ec 100644 --- a/src/vector/cl_SV_number_debug.cc +++ b/src/vector/cl_SV_number_debug.cc @@ -1,7 +1,7 @@ // cl_SV_number debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. @@ -11,7 +11,7 @@ #include "cln/output.h" #include "cln/SV_number.h" #include "cln/io.h" -#include "cl_SV_io.h" +#include "vector/cl_SV_io.h" namespace cln { diff --git a/src/vector/cl_SV_ringelt.cc b/src/vector/cl_SV_ringelt.cc index 7a30c6b..accb51b 100644 --- a/src/vector/cl_SV_ringelt.cc +++ b/src/vector/cl_SV_ringelt.cc @@ -1,7 +1,7 @@ // cl_make_heap_SV_ringelt(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/SV_ringelt.h" diff --git a/src/vector/cl_SV_ringelt_debug.cc b/src/vector/cl_SV_ringelt_debug.cc index 6c65cd9..eca08be 100644 --- a/src/vector/cl_SV_ringelt_debug.cc +++ b/src/vector/cl_SV_ringelt_debug.cc @@ -1,7 +1,7 @@ // cl_SV_ringelt debugging support. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. diff --git a/src/vector/output/Makeflags b/src/vector/output/Makeflags deleted file mode 100644 index da6ad7c..0000000 --- a/src/vector/output/Makeflags +++ /dev/null @@ -1,4 +0,0 @@ -# This file contains additional flags for the main Makefile. - -include $(srcdir)/vector/Makeflags -SUBDIR_INCLUDES += diff --git a/src/vector/output/cl_GV_number_aprint.cc b/src/vector/output/cl_GV_number_aprint.cc index d585fb0..c9513a8 100644 --- a/src/vector/output/cl_GV_number_aprint.cc +++ b/src/vector/output/cl_GV_number_aprint.cc @@ -1,14 +1,14 @@ // print_vector(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/GV_complex.h" #include "cln/GV_real.h" #include "cln/GV_rational.h" #include "cln/GV_integer.h" -#include "cl_GV_io.h" +#include "vector/cl_GV_io.h" // Implementation. diff --git a/src/vector/output/cl_SV_aprint.cc b/src/vector/output/cl_SV_aprint.cc index 7cfb89f..1f6e3cd 100644 --- a/src/vector/output/cl_SV_aprint.cc +++ b/src/vector/output/cl_SV_aprint.cc @@ -1,7 +1,7 @@ // fprint() for cl_SV_ringelt. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/SV_ringelt.h" diff --git a/src/vector/output/cl_SV_number_aprint.cc b/src/vector/output/cl_SV_number_aprint.cc index ac80026..cc28201 100644 --- a/src/vector/output/cl_SV_number_aprint.cc +++ b/src/vector/output/cl_SV_number_aprint.cc @@ -1,14 +1,14 @@ // print_vector(). // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. #include "cln/SV_complex.h" #include "cln/SV_real.h" #include "cln/SV_rational.h" #include "cln/SV_integer.h" -#include "cl_SV_io.h" +#include "vector/cl_SV_io.h" // Implementation. -- 2.45.2