Browse Source

Release 1.7.1

Carsten Larsen 2 years ago
parent
commit
331a9141be
93 changed files with 1598 additions and 5177 deletions
  1. 6
    1
      HISTORY
  2. 0
    122
      Makefile
  3. 20
    29
      amath.1
  4. 1
    1
      amath.doxygen
  5. 0
    62
      build/flexcat/Makefile
  6. 5
    5
      builddebdev
  7. 3
    17
      buildwin
  8. 0
    114
      catalog/dansk/amath-help.ct
  9. 0
    121
      catalog/dansk/amath-ident.ct
  10. 0
    164
      catalog/dansk/amath-keyword.ct
  11. 0
    136
      catalog/dansk/amath-text.ct
  12. 13
    18
      configure
  13. 25
    70
      src/amath.h
  14. 0
    28
      src/amath.sln
  15. 0
    146
      src/amath.vcxproj
  16. 0
    17
      src/amath.vcxproj.filters
  17. 1
    0
      src/amathc.h
  18. 0
    104
      src/clib/Makefile
  19. 14
    21
      src/clib/amathc.3
  20. 1
    1
      src/clib/amathc.pc
  21. 0
    113
      src/clib/amathc.vcxproj
  22. 0
    40
      src/clib/amathc.vcxproj.filters
  23. 37
    19
      src/clib/mem.c
  24. 0
    259
      src/cplex/Makefile
  25. 1
    1
      src/cplex/amathi.3
  26. 1
    1
      src/cplex/amathi.pc
  27. 0
    142
      src/cplex/amathi.vcxproj
  28. 0
    123
      src/cplex/amathi.vcxproj.filters
  29. 0
    112
      src/lib/Makefile
  30. 10
    19
      src/lib/aengine.cpp
  31. 1
    1
      src/lib/aengine.h
  32. 1
    1
      src/lib/amatha.pc
  33. 0
    124
      src/lib/amatha.vcxproj
  34. 0
    69
      src/lib/amatha.vcxproj.filters
  35. 0
    51
      src/localize/tags.h
  36. 8
    5
      src/main.cpp
  37. 8
    15
      src/main.h
  38. 0
    52
      src/main/Makefile
  39. 0
    187
      src/main/function/Makefile
  40. 0
    224
      src/main/function/functions.vcxproj
  41. 0
    366
      src/main/function/functions.vcxproj.filters
  42. 0
    134
      src/main/main.vcxproj
  43. 0
    96
      src/main/main.vcxproj.filters
  44. 1
    1
      src/main/parser.cpp
  45. 0
    94
      src/main/statement/Makefile
  46. 3
    8
      src/main/statement/about.cpp
  47. 1
    1
      src/main/statement/help.cpp
  48. 3
    37
      src/main/statement/license.cpp
  49. 0
    161
      src/main/statement/statements.vcxproj
  50. 0
    177
      src/main/statement/statements.vcxproj.filters
  51. 3
    2
      src/main/statement/version.cpp
  52. 0
    306
      src/real/Makefile
  53. 1
    1
      src/real/amathr.3
  54. 1
    1
      src/real/amathr.pc
  55. 0
    76
      src/system/Makefile
  56. 141
    5
      src/system/console.cpp
  57. 17
    6
      src/system/console.h
  58. 3
    9
      src/system/console_amiga.cpp
  59. 7
    4
      src/system/console_amiga.h
  60. 135
    0
      src/system/console_posix.cpp
  61. 30
    29
      src/system/console_posix.h
  62. 20
    51
      src/system/console_stdc.cpp
  63. 15
    19
      src/system/console_stdc.h
  64. 248
    0
      src/system/console_windows.cpp
  65. 31
    35
      src/system/console_windows.h
  66. 4
    4
      src/system/filesystem_stdc.cpp
  67. 44
    3
      src/system/language.cpp
  68. 2
    0
      src/system/language.h
  69. 8
    9
      src/system/language_amiga.cpp
  70. 1
    2
      src/system/language_posix.cpp
  71. 0
    1
      src/system/language_stdc.cpp
  72. 2
    2
      src/system/preferences_amiga.cpp
  73. 6
    3
      src/system/preferences_stdc.cpp
  74. 0
    103
      src/system/proc_amiga.cpp
  75. 34
    4
      src/system/program.cpp
  76. 7
    2
      src/system/program.h
  77. 33
    28
      src/system/program_amiga.cpp
  78. 6
    2
      src/system/program_amiga.h
  79. 152
    0
      src/system/program_haiku.cpp
  80. 15
    22
      src/system/program_haiku.h
  81. 50
    29
      src/system/program_stdc.cpp
  82. 2
    4
      src/system/program_stdc.h
  83. 5
    5
      src/system/program_test.cpp
  84. 1
    1
      src/system/program_test.h
  85. 0
    158
      src/system/system.vcxproj
  86. 0
    168
      src/system/system.vcxproj.filters
  87. 0
    91
      src/system/task_amiga.cpp
  88. 0
    64
      src/system/task_stdc.cpp
  89. 0
    59
      src/system/thread.h
  90. 27
    31
      src/system/window_amiga.cpp
  91. 3
    5
      src/system/window_amiga.h
  92. 322
    0
      src/system/window_haiku.cpp
  93. 58
    23
      src/system/window_haiku.h

+ 6
- 1
HISTORY View File

@@ -2,7 +2,12 @@
2 2
 ---                           amath change history                          ---
3 3
 -------------------------------------------------------------------------------
4 4
 
5
-v1.7.0 March 12 2017
5
+v1.7.1 March 26 2017
6
+- Haiku support.
7
+- Unified ANSI console.
8
+- Code cleanup.
9
+
10
+v1.7.1 March 12 2017
6 11
 - Introduce scientific notation.
7 12
 - Introduce Not a Number (NaN).
8 13
 - Fixed bugs related to infinity (Inf).

+ 0
- 122
Makefile View File

@@ -1,122 +0,0 @@
1
-
2
-CC       = gcc
3
-CXX      = g++
4
-CFLAGS   = -O2 -DWITHTEST -Wall -Isrc -Isrc/main
5
-CXXFLAGS = -O2 -DWITHTEST  -Wall -Isrc -Isrc/main
6
-AR       = ar
7
-RANLIB   = ranlib
8
-LFLAGS   = -lappsystem -lfunctions -lstatement -lappmain -lfunctions -lstatement -lappmain -lamathapp -lamathcplex -lamath -lamathc -lstdc++
9
-LPATH    = -Lsrc/lib -Lsrc/clib -Lsrc/real -Lsrc/cplex -Lsrc/main/function -Lsrc/main/statement -Lsrc/main -Lsrc/system
10
-LPATHS   = -Lsrc/lib/static -Lsrc/clib/static -Lsrc/real/static -Lsrc/cplex/static -Lsrc/main/function -Lsrc/main/statement -Lsrc/main -Lsrc/system
11
-FLXCAT   = build/flexcat/flexcat
12
-MKDIR    = mkdir -p
13
-DEL      = rm -f
14
-INSTALLP = install -m 0755
15
-INSTALLM = install -m 0644
16
-PREFIX   = /usr
17
-INSTDIRP  = ${DESTDIR}${PREFIX}/bin
18
-INSTDIRM  = ${DESTDIR}${PREFIX}/share/man/man1
19
-
20
-all:	shared-app
21
-app:	appmain functions statement appsystem
22
-libs:	amathapp amath amathc amathcplex
23
-
24
-amath:	static-app
25
-static:	static-app
26
-
27
-src/main.o:	src/main.cpp
28
-	${CXX} ${CXXFLAGS} -c src/main.cpp -o src/main.o
29
-
30
-appmain:
31
-	cd src/main && ${MAKE}
32
-
33
-appsystem:
34
-	cd src/system && ${MAKE}
35
-
36
-functions:
37
-	cd src/main/function && ${MAKE}
38
-
39
-statement:
40
-	cd src/main/statement && ${MAKE}
41
-
42
-amathapp:
43
-	cd src/lib && ${MAKE}
44
-
45
-amath:
46
-	cd src/real && ${MAKE}
47
-
48
-amathc:
49
-	cd src/clib && ${MAKE}
50
-
51
-amathcplex:
52
-	cd src/cplex && ${MAKE}
53
-
54
-localize:
55
-	cd build/flexcat && ${MAKE}
56
-	${FLXCAT} text/keyword.cd src/localize/kword.h=text/keyword.sd
57
-	${FLXCAT} text/help.cd src/localize/help.h=text/help.sd
58
-	${FLXCAT} text/ident.cd src/localize/ident.h=text/ident.sd
59
-	${FLXCAT} text/text.cd src/localize/text.h=text/text.sd
60
-
61
-catalogs:
62
-	cd build/flexcat && ${MAKE}
63
-	${MKDIR}  dist/catalog/english
64
-	${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog
65
-	${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog
66
-	${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog
67
-	${MKDIR}  dist/catalog/dansk
68
-	${FLXCAT} text/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog
69
-	${FLXCAT} text/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog
70
-	${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog
71
-	${FLXCAT} text/keyword.cd catalog/dansk/amath-keyword.ct CATALOG dist/catalog/dansk/amath-keyword.catalog
72
-
73
-shared-app:	app libs src/main.o
74
-	${CC} ${CFLAGS} -s src/main.o -o amath ${LPATH} ${LFLAGS}
75
-
76
-static-app: src/main.o
77
-	cd src/lib && ${MAKE} static
78
-	cd src/clib && ${MAKE} static
79
-	cd src/real && ${MAKE} static
80
-	cd src/cplex && ${MAKE} static
81
-	cd src/main && ${MAKE} static
82
-	cd src/system && ${MAKE} static
83
-	cd src/main/function && ${MAKE} static
84
-	cd src/main/statement && ${MAKE} static
85
-	${CC} ${CFLAGS} -s src/main.o -o amath ${LPATHS} ${LFLAGS}
86
-
87
-.PHONY: test
88
-test: amath
89
-	LD_LIBRARY_PATH=src/clib/:src/lib:src/cplex:scr/real
90
-	./amath test
91
-
92
-.PHONY: install
93
-install: shared-app
94
-	cd src/lib && ${MAKE} install
95
-	cd src/clib && ${MAKE} install
96
-	cd src/real && ${MAKE} install
97
-	cd src/cplex && ${MAKE} install
98
-	${INSTALLP} amath ${INSTDIRP}/amath
99
-	${INSTALLM} amath.1 ${INSTDIRM}/amath.1
100
-
101
-.PHONY: uninstall
102
-uninstall:
103
-	cd src/lib && ${MAKE} uninstall
104
-	cd src/clib && ${MAKE} uninstall
105
-	cd src/real && ${MAKE} uninstall
106
-	cd src/cplex && ${MAKE} uninstall
107
-	${DEL} ${INSTDIRP}/amath
108
-	${DEL} ${INSTDIRM}/amath.1
109
-
110
-.PHONY: clean
111
-clean:
112
-	cd src/lib && ${MAKE} clean
113
-	cd src/clib && ${MAKE} clean
114
-	cd src/real && ${MAKE} clean
115
-	cd src/cplex && ${MAKE} clean
116
-	cd src/main && ${MAKE} clean
117
-	cd src/system && ${MAKE} clean
118
-	cd src/main/function && ${MAKE} clean
119
-	cd src/main/statement && ${MAKE} clean
120
-	cd build/flexcat && ${MAKE} clean
121
-	${DEL} src/main.o amath
122
-

+ 20
- 29
amath.1 View File

@@ -1,11 +1,11 @@
1
-.TH "amath" 1 "Wed Mar 1 2017" "Version 1.7.0" "amath" \" -*- nroff -*-
1
+.TH "amath" 1 "Wed Mar 15 2017" "Version 1.7.1" "amath" \" -*- nroff -*-
2 2
 .ad l
3 3
 .nh
4 4
 .SH NAME
5
-amath \- Statements and functions
5
+amath \- Simple command line calculator
6 6
 
7 7
 .SH SYNOPSIS
8
-\fCamath [expression]\fP
8
+\fCamath [ --shell | --noansi | expression ]\fP
9 9
 
10 10
 .SH Description
11 11
 amath(1) features a case sensitive command line interface, internal
@@ -36,19 +36,18 @@ version     Show version string
36 36
 memory      Show internal memory usage
37 37
 exit        Exit program
38 38
 .fi
39
-.PP
40
- 
39
+
41 40
 .SH "Operators"
42 41
 .PP
43 42
 .nf
44
-+           Mathematical addition.
45
--           Mathematical subtraction.
46
-*           Mathematical multiplication.
47
-/           Mathematical division.
48
-^           Mathematical exponentiation.
49
-=           Assignment of variable values.
50
-|           Absolute value of number.
51
- 
43
++           Mathematical addition
44
+-           Mathematical subtraction
45
+*           Mathematical multiplication
46
+/           Mathematical division
47
+^           Mathematical exponentiation
48
+=           Assignment of variable values
49
+|           Absolute value of number
50
+
52 51
 .SH "Variables and constant"
53 52
 .PP
54 53
 .nf
@@ -57,7 +56,6 @@ e           Euler's number
57 56
 i           Imaginary unit
58 57
 ins         Result of last calculation
59 58
 .fi
60
-.PP
61 59
 
62 60
 .SH "Base functions"
63 61
 .PP
@@ -74,8 +72,7 @@ lb          Binary logarithm function (base 2)
74 72
 ln          Natural logarithm function (base e)
75 73
 lg          Common logarithm function (base 10)
76 74
 .fi
77
-.PP
78
- 
75
+
79 76
 .SH "Trigonometric functions"
80 77
 .PP
81 78
 .nf
@@ -92,8 +89,7 @@ arccot      Inverse trigonometric cotangent function
92 89
 arcsec      Inverse trigonometric secant function
93 90
 arccsc      Inverse trigonometric cosecant function
94 91
 .fi
95
-.PP
96
- 
92
+
97 93
 .SH "Hyperbolic functions"
98 94
 .PP
99 95
 .nf
@@ -110,8 +106,7 @@ arccoth     Inverse hyperbolic cotangent function
110 106
 arcsech     Inverse hyperbolic secant function
111 107
 arccsch     Inverse hyperbolic cosecant function
112 108
 .fi
113
-.PP
114
- 
109
+
115 110
 .SH "Early trigonometric functions"
116 111
 .PP
117 112
 .nf
@@ -132,8 +127,7 @@ archvc      Inverse haversed cosine function
132 127
 archcv      Inverse hacoversed sine function
133 128
 archcc      Inverse hacoversed cosine function
134 129
 .fi
135
-.PP
136
- 
130
+
137 131
 .SH "Example script"
138 132
 .PP
139 133
 .nf
@@ -143,8 +137,7 @@ floor(39.9531);floor(-39.9531);
143 137
 trunc(23.827);trunc(-23.827);
144 138
 sqrt(100);sqrt(52.23);
145 139
 .fi
146
-.PP
147
- 
140
+
148 141
 .SH "Example script with functions"
149 142
 .PP
150 143
 .nf
@@ -154,8 +147,7 @@ a=2;b=3;c=a+b;
154 147
 vars;funcs;
155 148
 f(2.2);c+1.1;
156 149
 .fi
157
-.PP
158
- 
150
+
159 151
 .SH "Example script with complex numbers"
160 152
 .PP
161 153
 .nf
@@ -166,8 +158,7 @@ coth(1+2i);
166 158
 sech(1+2i);
167 159
 csch(1+2i);
168 160
 .fi
169
-.PP
170
- 
161
+
171 162
 .SH "See also"
172
-.PP 
163
+.PP
173 164
 amathc(3), amathr(3), amathi(3)

+ 1
- 1
amath.doxygen View File

@@ -38,7 +38,7 @@ PROJECT_NAME           = "amath"
38 38
 # could be handy for archiving the generated documentation or if some version
39 39
 # control system is used.
40 40
 
41
-PROJECT_NUMBER         = "1.7.0"
41
+PROJECT_NUMBER         = "1.7.1"
42 42
 
43 43
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
44 44
 # for a project that appears at the top of each page and should give viewer a

+ 0
- 62
build/flexcat/Makefile View File

@@ -1,62 +0,0 @@
1
-all:	flexcat
2
-
3
-CFLAGS += -I. -Wall
4
-
5
-asprintf.o:	asprintf.c
6
-	${CC} ${CFLAGS} -c asprintf.c
7
-
8
-createcat.o:	createcat.c
9
-	${CC} ${CFLAGS} -c createcat.c
10
-
11
-createcatsrc.o:	createcatsrc.c
12
-	${CC} ${CFLAGS} -c createcatsrc.c
13
-
14
-createct.o:	createct.c
15
-	${CC} ${CFLAGS} -c createct.c
16
-
17
-globals.o:	globals.c
18
-	${CC} ${CFLAGS} -c globals.c
19
-
20
-locale_other.o:	locale_other.c
21
-	${CC} ${CFLAGS} -c locale_other.c
22
-
23
-main.o:	main.c
24
-	${CC} ${CFLAGS} -c main.c
25
-
26
-openlibs.o:	openlibs.c
27
-	${CC} ${CFLAGS} -c openlibs.c
28
-
29
-readprefs.o:	readprefs.c
30
-	${CC} ${CFLAGS} -c readprefs.c
31
-
32
-scancd.o:	scancd.c
33
-	${CC} ${CFLAGS} -c scancd.c
34
-
35
-scanct.o:	scanct.c
36
-	${CC} ${CFLAGS} -c scanct.c
37
-
38
-scanpo.o:	scanpo.c
39
-	${CC} ${CFLAGS} -c scanpo.c
40
-
41
-showfuncs.o:	showfuncs.c
42
-	${CC} ${CFLAGS} -c showfuncs.c
43
-
44
-strptime.o:	strptime.c
45
-	${CC} ${CFLAGS} -c strptime.c
46
-
47
-swapfuncs.o:	swapfuncs.c
48
-	${CC} ${CFLAGS} -c swapfuncs.c
49
-
50
-utils.o:	utils.c
51
-	${CC} ${CFLAGS} -c utils.c
52
-
53
-vastubs.o:	vastubs.c
54
-	${CC} ${CFLAGS} -c vastubs.c
55
-
56
-
57
-flexcat:	 asprintf.o createcat.o createcatsrc.o createct.o globals.o locale_other.o main.o openlibs.o readprefs.o scancd.o scanct.o scanpo.o showfuncs.o strptime.o swapfuncs.o utils.o vastubs.o
58
-	${CC} ${CFLAGS} -o flexcat  asprintf.o createcat.o createcatsrc.o createct.o globals.o locale_other.o main.o openlibs.o readprefs.o scancd.o scanct.o scanpo.o showfuncs.o strptime.o swapfuncs.o utils.o vastubs.o -lm
59
-
60
-clean:
61
-	rm -f  asprintf.o createcat.o createcatsrc.o createct.o globals.o locale_other.o main.o openlibs.o readprefs.o scancd.o scanct.o scanpo.o showfuncs.o strptime.o swapfuncs.o utils.o vastubs.o flexcat
62
-

builddeb → builddebdev View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 set -e
4 4
 
5
-version="1.7.0"
5
+version="1.7.1"
6 6
 
7 7
 build_package () {
8 8
 
@@ -11,7 +11,7 @@ rm -f amath-${version}_$1.deb
11 11
 sh configure CFLAGS=$2
12 12
 make clean
13 13
 
14
-echo "Building $3 bit package of amath ${version} for Debian ..."
14
+echo "Building $3 bit package of amath-dev ${version} for Debian ..."
15 15
 make
16 16
 mv amath amath.tmp
17 17
 
@@ -91,7 +91,7 @@ chmod 644 amath/usr/share/amath/*
91 91
 
92 92
 # Create control file
93 93
 {
94
-echo "Package: amath"
94
+echo "Package: amath-dev"
95 95
 echo "Version: ${version}"
96 96
 echo "Architecture: $1"
97 97
 echo "Maintainer: Carsten Larsen <cs@innolan.net>"
@@ -113,7 +113,7 @@ chmod 0755 amath/DEBIAN/control
113 113
 # Create license file
114 114
 {
115 115
 echo "Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/"
116
-echo "Upstream-Name: amath"
116
+echo "Upstream-Name: amath-dev"
117 117
 echo "Source: http://amath.innolan.net"
118 118
 echo 
119 119
 echo "Files:     *"
@@ -191,7 +191,7 @@ echo "rm -f /usr/lib/libamathcplex.so.${version}"
191 191
 chmod 0755 amath/DEBIAN/postrm
192 192
 
193 193
 fakeroot dpkg-deb --build amath
194
-mv amath.deb amath-${version}_$1.deb
194
+mv amath.deb amath-dev-${version}_$1.deb
195 195
 rm -Rf amath
196 196
 }
197 197
 

+ 3
- 17
buildwin View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 set -e
4 4
 
5
-version="1.7.0"
5
+version="1.7.1"
6 6
 
7 7
 echo "Building amath ${version} for Windows ..."
8 8
 
@@ -11,37 +11,23 @@ rm -Rf amath
11 11
 rm -Rf dist
12 12
 mkdir dist
13 13
 
14
-./configure --enable-test --cross-compile="i686-w64-mingw32" CFLAGS="-D_WIN32" LDFLAGS="-static -static-libgcc -static-libstdc++"
14
+./configure --enable-test --cross-compile="i686-w64-mingw32" CFLAGS="-DWINDOWS" LDFLAGS="-static -static-libgcc -static-libstdc++"
15 15
 make clean
16 16
 make static
17 17
 mv amath dist/amath-${version}-x86.exe
18 18
 make clean
19 19
 
20
-./configure --enable-test --cross-compile="x86_64-w64-mingw32" CFLAGS="-D_WIN32" LDFLAGS="-static -static-libgcc -static-libstdc++"
20
+./configure --enable-test --cross-compile="x86_64-w64-mingw32" CFLAGS="-DWINDOWS" LDFLAGS="-static -static-libgcc -static-libstdc++"
21 21
 make static
22 22
 mv amath dist/amath-${version}-x64.exe
23 23
 make clean
24 24
 
25
-./configure --enable-test --cross-compile="i686-w64-mingw32" CFLAGS="-D_WIN32 -DANSICONSOLE" LDFLAGS="-static -static-libgcc -static-libstdc++"
26
-make static
27
-mv amath dist/amath-${version}-ansi-x86.exe
28
-make clean
29
-
30
-./configure --enable-test --cross-compile="x86_64-w64-mingw32" CFLAGS="-D_WIN32 -DANSICONSOLE" LDFLAGS="-static -static-libgcc -static-libstdc++"
31
-make static
32
-mv amath dist/amath-${version}-ansi-x64.exe
33
-make clean
34
-
35 25
 cd dist
36 26
 touch hashkeys
37 27
 sha1sum amath-${version}-x86.exe >>hashkeys
38 28
 sha1sum amath-${version}-x86.exe >>hashkeys
39
-sha1sum amath-${version}-ansi-x86.exe >>hashkeys
40
-sha1sum amath-${version}-ansi-x64.exe >>hashkeys
41 29
 sha256sum amath-${version}-x86.exe >>hashkeys
42 30
 sha256sum amath-${version}-x86.exe >>hashkeys
43
-sha256sum amath-${version}-ansi-x86.exe >>hashkeys
44
-sha256sum amath-${version}-ansi-x64.exe >>hashkeys
45 31
 cd ..
46 32
 
47 33
 cp LICENSE dist/

+ 0
- 114
catalog/dansk/amath-help.ct View File

@@ -1,114 +0,0 @@
1
-## version $VER: amath-help.catalog 1.60 (09.04.2015) Danish
2
-## language dansk
3
-## codeset 0
4
-; #############################################################################
5
-; Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
6
-; All rights reserved.
7
-; 
8
-; Redistribution and use in source and binary forms, with or without
9
-; modification, are permitted provided that the following conditions are met:
10
-; 
11
-; * Redistributions of source code must retain the above copyright notice, this
12
-;   list of conditions and the following disclaimer.
13
-; 
14
-; * Redistributions in binary form must reproduce the above copyright notice,
15
-;   this list of conditions and the following disclaimer in the documentation
16
-;   and/or other materials provided with the distribution.
17
-; 
18
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19
-; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20
-; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21
-; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22
-; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23
-; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24
-; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25
-; CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26
-; OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27
-; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
-; #############################################################################
29
-; ### flexcat catalog/help.cd NEWCTFILE catalog/danish/amath-help.ct
30
-; flexcat catalog/help.cd catalog/danish/amath-help.ct CATALOG catalog/danish/amath-help.catalog
31
-; #############################################################################
32
-symzero
33
-Indtast kommando eller udtryk.#NEWLINE##SYNTAXHIGHLIGHT#Eksempel: 2+3-cos(3)#NORMALTEXT##NEWLINE# #NEWLINE#Mere hj�lp er tilg�ngelig i udvalgte omr�der#NEWLINE#-------------------------------------------------#NEWLINE#funktioner   Grundl�ggende funktioner.#NEWLINE#trigo        Trigonometriske funktioner.#NEWLINE#hyper        Hyperbolske funktioner.#NEWLINE#kompleks     Komplekse tal.#NEWLINE#kommandoer   Underst�ttede kommondoer.#NEWLINE#operatorer   Underst�ttede operatorer.#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Eksemple: hj�lp trigo#NEWLINE#
34
-symoperator
35
--------------------------------------------------#NEWLINE#    +    Matematik addition.#NEWLINE#    -    Matematik subtraktion.#NEWLINE#    *    Matematik multiplikation.#NEWLINE#    /    Matematik division.#NEWLINE#    ^    Matematik potensopl�ftning.#NEWLINE#    =    Tildeling af variabel v�rdi.#NEWLINE#    |    Absolutte eller numerisk v�rdi.#NEWLINE#-------------------------------------------------#NEWLINE#
36
-symfunction
37
--------------------------------------------------#NEWLINE#abs     Absolutte eller numerisk v�rdi.#NEWLINE#sgn     Matematik signum funktion.#NEWLINE#round   Afrund til n�rmeste heltal.#NEWLINE#trunc   Fjern decimaler.#NEWLINE#floor   Afrund i positiv retning.#NEWLINE#ceil    Afrund i negativ retning.#NEWLINE#sqrt    Kvadratrodsfunktion (exponent 1/2).#NEWLINE#cbrt    Kubikrods (exponent 1/3).#NEWLINE#lb      Bin�r logaritme funktion (grundtal 2).#NEWLINE#ln      Naturlig logaritme funktion (grundtal e).#NEWLINE#lg      10-talslogaritme funktion (grundtal 10).#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Eksempel: round(1.55)#NORMALTEXT##NEWLINE#
38
-symtrigon
39
--------------------------------------------------#NEWLINE#sin     Trigonometrisk sinus funktion.#NEWLINE#cos     Trigonometrisk cosinus funktion.#NEWLINE#tan     Trigonometrisk tangent funktion.#NEWLINE#cot     Trigonometrisk cotangent funktion.#NEWLINE#sec     Trigonometrisk secant funktion.#NEWLINE#csc     Trigonometrisk cosecant funktion.#NEWLINE#asin    Invers trigonometrisk sinus funktion.#NEWLINE#acos    Invers trigonometrisk cosinus funktion.#NEWLINE#atan    Invers trigonometrisk tangent funktion.#NEWLINE#acot    Invers trigonometrisk cotangent funktion.#NEWLINE#asec    Invers trigonometrisk secant funktion.#NEWLINE#acsc    Invers trigonometrisk cosecant funktion.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse funktioner kan prefixes med ar eller arc #NEWLINE#i stedet for a.#NEWLINE#
40
-symhyper
41
--------------------------------------------------#NEWLINE#sinh    Hyperbolsk sinus funktion.#NEWLINE#cosh    Hyperbolsk cosinus funktion.#NEWLINE#tanh    Hyperbolsk tangent funktion.#NEWLINE#coth    Hyperbolsk cotangent funktion.#NEWLINE#sech    Hyperbolsk secant funktion.#NEWLINE#csch    Hyperbolsk cosecant funktion.     #NEWLINE#asinh   Invers hyperbolsk sinus funktion.#NEWLINE#acosh   Invers hyperbolsk cosinus funktion.#NEWLINE#atanh   Invers hyperbolsk tangent funktion.#NEWLINE#acoth   Invers hyperbolsk cotangent funktion.#NEWLINE#asech   Invers hyperbolsk secant funktion.#NEWLINE#acsch   Invers hyperbolsk cosecant funktion.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse funktioner kan prefixes med ar eller arc #NEWLINE#i stedet for a.#NEWLINE#
42
-symearly
43
-TODO-------------------------------------------------#NEWLINE#ver     Versed sine function.#NEWLINE#vcs     Versed cosine function.#NEWLINE#cvs     Coversed sine function.#NEWLINE#cvc     Coversed cosine function.#NEWLINE#hv      Haversed sine function.#NEWLINE#hvc     Haversed cosine function.#NEWLINE#hcv     Hacoversed sine function.#NEWLINE#hcc     Hacoversed cosine function.#NEWLINE#aver    Inverse versed sine function.#NEWLINE#avcs    Inverse versed cosine function.#NEWLINE#acvs    Inverse coversed sine function.#NEWLINE#acvc    Inverse coversed cosine function.#NEWLINE#ahv     Inverse haversed sine function.#NEWLINE#ahvc    Inverse haversed cosine function.#NEWLINE#ahcv    Inverse hacoversed sine function.#NEWLINE#ahcc    Inverse hacoversed cosine function.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse functions can be prefixed with ar or arc #NEWLINE#instead of a.#NEWLINE#
44
-symcomplex
45
-Udtryk med komplekse tal skrives ved at angive i#NEWLINE#sammen med den imagin�re talv�rdi. Komplekse tal#NEWLINE#kan blandes med reelle tal.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: 2+3i#NEWLINE#Eksempel: 2+3.2i*cos(-1i)+5/7#NEWLINE#
46
-symclear
47
-Ryd kommandoen sletter alt tekst i konsol vinduet.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: ryd#NEWLINE#
48
-symdef
49
-Definer kommandoen bruges til at definere funktioner med. Det er ikke#NEWLINE#strengt n�dvendigt at angive kommandoen, n�r en funktion skal defineres.#NEWLINE#Allerede definerede funktioner kan vises med kommandoen #SYNTAXHIGHLIGHT#funtioner#NORMAL#.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: definer f(x)=2*x+3#NEWLINE#Alternativ syntaks: f(x)=2*x+3#NEWLINE#
50
-; Help for delete statement
51
-symdelete
52
-The delete statement can delete variable and funktions. To delete a#NEWLINE#single variable or funktions use the name of the funktion or variable.#NEWLINE#To delete all funktions or variables specify either the variable or#NEWLINE#funktion keyword.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: delete f(x)#NEWLINE#Syntaks: delete variables#NEWLINE#
53
-; Help for digits statement
54
-symdigits
55
-The digits statement defines the displayed number of significant digits.#NEWLINE#To show current configuration use the digits statement without specifying#NEWLINE#the number.#NEWLINE# #SYNTAXHIGHLIGHT#Syntaks: digits 7#NEWLINE#
56
-; Help for eval statement
57
-symeval
58
-The eval statement evaluates an expression. When evaluating an expression#NEWLINE#it is possible to omit the eval keyword.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: eval 2.4*x+3.2#NEWLINE#Optional syntax: 2.4*x+3.2#NEWLINE#
59
-; Help for execute statement
60
-symexecute
61
-The execute statement reads the content of a file and execute all statements.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: execute "savedfile"#NEWLINE#
62
-; Help for input statement
63
-syminput
64
-The input statement either changes or shows the how numeral input is interpreted.#NEWLINE#Possible input systems are: binary, octal, decimal and hexadecimal. Default is#NEWLINE#decimal. To use positional systems with other bases specify the base number.#NEWLINE#Numeral output system can be modified using the output statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: input hexadecimal#NEWLINE#Syntaks: input 4#NEWLINE#
65
-; Help for help statement
66
-symhelp
67
-The help statement can be used to display help about topics and statements.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: help variables#NEWLINE#
68
-; Help for output statement
69
-symoutput
70
-The output statement either changes or shows the how numeral output is shown.#NEWLINE#Possible output systems are: binary, octal, decimal and hexadecimal. Default#NEWLINE#is decimal. To use positional systems with other bases specify the base number.#NEWLINE#Numeral input system can be modified using the input statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: output octal#NEWLINE#
71
-; Help for list statement
72
-symlist
73
-No description is available for the list statement.#NEWLINE#
74
-symshow
75
-Vis kommandoen kan bruges til at vise indholdet af en fil, der �nskes k�rt.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: vis "mitscript"#NEWLINE#
76
-; Help for load statement
77
-symload
78
-The load statement retrieves a set of defined variables and funktions from#NEWLINE#a file. Variables and funktions can be saved using the save statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: load "savedwork"#NEWLINE#
79
-; Help for save statement
80
-symsave
81
-Med gem kommando kan variabler og funktioner i hukommelsen gemmes til en fil.#NEWLINE#Gemte variabler og funktion kan indl�stet igen med #SYNTAXHIGHLIGHT#hent#NORMAL# kommandoen.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: gem "mitarbejde"#NEWLINE#
82
-symversion
83
-Viser hvilken version af amath der k�rer.#NEWLINE#
84
-symabout
85
-TODOShow various information about the running version of amath.#NEWLINE#
86
-symlicense
87
-TODOShow license details.#NEWLINE#
88
-symmem
89
-Viser internt hukommelsesforbrug. Programkoden er ikke medregnet.#NEWLINE#
90
-; Help for prefs statement
91
-symprefs
92
-There is no help for prefs statement now.#NEWLINE#
93
-symvariable
94
-Variabler kommandoen viser en list af definerede variabler i hukommelsen.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: variabler#NEWLINE#Alternativ syntaks: var#NEWLINE#
95
-symexit
96
-Afslut kommandoen lukker amath programmet.#NEWLINE##SYNTAXHIGHLIGHT#Syntaks: afslut#NEWLINE#
97
-; Help for constant epsilon
98
-syme
99
-Euler's number is base of the exponential funktion which equals its own#NEWLINE#derivative. It is approximately equal to 2.71828.#NEWLINE##SYNTAXHIGHLIGHT#Example: ln(e)#NEWLINE#
100
-; Help for constant pi
101
-sympi
102
-Pi is the ratio of the circumference of a circle to its diameter. Being an#NEWLINE#irrational number, pi cannot be expressed exactly as a common fraction.#NEWLINE#The value of pi is commonly approximated as #SYNTAXHIGHLIGHT#3.14159#NORMALTEXT#.#NEWLINE#
103
-symi
104
-Den imagin�re enhen refereres og angives almindelig vis som i.#NEWLINE#Den imagin�re enhen et tal, som n�r det ganges med sig selv,#NEWLINE#giver resultatet -1.#NEWLINE#
105
-symins
106
-Den sidst udregnede v�rdi kan benyttes i n�ste udtryk ved hj�lp af #SYNTAXHIGHLIGHT#ins#NORMAL# variablen.#NEWLINE##SYNTAXHIGHLIGHT#Eksemple: ins*0,25#NEWLINE#
107
-symbin
108
-Der er ikke nogen hj�lp tilg�ngelig om bin�r n�gleordet.#NEWLINE
109
-symoct
110
-Der er ikke nogen hj�lp tilg�ngelig om oktal n�gleordet.#NEWLINE
111
-symdec
112
-Der er ikke nogen hj�lp tilg�ngelig om decimal n�gleordet.#NEWLINE
113
-symhex
114
-Der er ikke nogen hj�lp tilg�ngelig om hexadecimal n�gleordet.#NEWLINE

+ 0
- 121
catalog/dansk/amath-ident.ct View File

@@ -1,121 +0,0 @@
1
-## version $VER: amath-ident.catalog 1.60 (08.04.2015) Danish
2
-## language dansk
3
-## codeset 0
4
-; #############################################################################
5
-; ## Help texts for built-in functions in amath
6
-; ## ------------------------------------------
7
-; ##
8
-; ## This file is published under Creative Common License. See:
9
-; ## http://creativecommons.org/licenses/by-sa/3.0/
10
-; ## Parts of the content came from wikipedia.org
11
-; #############################################################################
12
-abs
13
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
14
-sgn
15
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
16
-round
17
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
18
-trunc
19
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
20
-floor
21
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
22
-ceil
23
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
24
-sqr
25
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
26
-cbr
27
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
28
-lb
29
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
30
-ln
31
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
32
-lg
33
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
34
-sin
35
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
36
-cos
37
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
38
-tan
39
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
40
-cot
41
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
42
-sec
43
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
44
-csc
45
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
46
-asin
47
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
48
-acos
49
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
50
-atan
51
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
52
-acot
53
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
54
-asec
55
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
56
-acsc
57
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
58
-sinh
59
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
60
-cosh
61
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
62
-tanh
63
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
64
-coth
65
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
66
-sech
67
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
68
-csch
69
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
70
-asinh
71
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
72
-acosh
73
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
74
-atanh
75
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
76
-acoth
77
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
78
-asech
79
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
80
-acsch
81
-Der er ikke nogen hj�lp tilg�ngelig om den funktion.#NEWLINE#
82
-ver
83
-The versed sine is an early appearing trigonometric function.#NEWLINE#It is equal to one minus the cosine.#NEWLINE#ver(x) = 1 - cos(x)#NEWLINE#
84
-vcs
85
-The versed cosine is an early appearing trigonometric function.#NEWLINE#It is equal to one plus the cosine.#NEWLINE#ver(x) = 1 + cos(x)#NEWLINE#
86
-cvs
87
-The coversed sine is an early appearing trigonometric function.#NEWLINE#It is equal to one minus the sine.#NEWLINE#ver(x) = 1 - sin(x)#NEWLINE#
88
-cvc
89
-The coversed cosine is an early appearing trigonometric function.#NEWLINE#It is equal to one plus the sine.#NEWLINE#cvc(x) = 1 + sin(x)#NEWLINE#
90
-hv
91
-No help is available for the haversed sine function.#NEWLINE#
92
-hvc
93
-No help is available for the haversed cosine function.#NEWLINE#
94
-hcv
95
-No help is available for the hacoversed sine function.#NEWLINE#
96
-hcc
97
-No help is available for the hacoversed cosine function.#NEWLINE#
98
-aver
99
-No help is available for this function.#NEWLINE#
100
-avcs
101
-No help is available for this function.#NEWLINE#
102
-acvs
103
-No help is available for this function.#NEWLINE#
104
-acvc
105
-No help is available for this function.#NEWLINE#
106
-ahv
107
-No help is available for this function.#NEWLINE#
108
-ahvc
109
-No help is available for this function.#NEWLINE#
110
-ahcv
111
-No help is available for this function.#NEWLINE#
112
-ahcc
113
-No help is available for this function.#NEWLINE#
114
-exsec
115
-No help is available for this function.#NEWLINE#
116
-excsc
117
-No help is available for this function.#NEWLINE#
118
-aexsec
119
-No help is available for this function.#NEWLINE#
120
-aexcsc
121
-No help is available for this function.#NEWLINE#

+ 0
- 164
catalog/dansk/amath-keyword.ct View File

@@ -1,164 +0,0 @@
1
-## version $VER: amath-keyword.catalog 1.60 (08.04.2015) Danish
2
-## language dansk
3
-## codeset 0
4
-;#############################################################################
5
-; Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
6
-; All rights reserved.
7
-; 
8
-; Redistribution and use in source and binary forms, with or without
9
-; modification, are permitted provided that the following conditions are met:
10
-; 
11
-; * Redistributions of source code must retain the above copyright notice, this
12
-;   list of conditions and the following disclaimer.
13
-; 
14
-; * Redistributions in binary form must reproduce the above copyright notice,
15
-;   this list of conditions and the following disclaimer in the documentation
16
-;   and/or other materials provided with the distribution.
17
-; 
18
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19
-; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20
-; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21
-; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22
-; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23
-; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24
-; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25
-; CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26
-; OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27
-; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
-;#############################################################################
29
-;######### ClearStatement
30
-clear
31
-ryd
32
-;######### FunctionDefinition statement
33
-def
34
-definer
35
-;######### DeleteStatement and keyword 
36
-delete
37
-slet
38
-;######### Eulers Number keyword
39
-e
40
-e
41
-;######### Complex i keyword
42
-i
43
-i
44
-;######### pi keyword
45
-pi
46
-pi
47
-;######### ins variable keyword
48
-ins
49
-ins
50
-;######### EvalStatement
51
-eval
52
-beregn
53
-;######### DrawStatement
54
-draw
55
-tegn
56
-;######### PlotStatement
57
-plot
58
-plot
59
-;######### ExecuteStatement
60
-execute
61
-k�r
62
-;######### ExitStatement
63
-exit
64
-afslut
65
-quit
66
-slut
67
-;######### Statements keyword
68
-statements
69
-kommandoer
70
-;######### Operators keyword
71
-operators
72
-operatorer
73
-;######### Complex keyword
74
-complex
75
-kompleks
76
-;######### Function keyword
77
-funcs
78
-funk
79
-functions
80
-funktioner
81
-;######### Trigonometric keyword
82
-trigon
83
-trigo
84
-trigonometric
85
-trigonometri
86
-;######### Hyperbolic keyword
87
-hyper
88
-hyper
89
-hyperbolic
90
-hyperbolsk
91
-;######### Early keyword
92
-early
93
-tidlig
94
-;######### HelpStatement
95
-help
96
-hj�lp
97
-;######### PromptStatement
98
-prompt
99
-prompt
100
-;######### VersionStatement
101
-version
102
-version
103
-;######### MemoryStatement
104
-mem
105
-hukommelse
106
-memory
107
-hukommelse
108
-;######### PrefsStatement
109
-prefs
110
-pr�f
111
-preferences
112
-pr�ferencer
113
-;######### ListStatement and keyword
114
-list
115
-list
116
-;######### LoadStatement and keyword
117
-load
118
-hent
119
-;######### SaveStatement and keyword
120
-save
121
-gem
122
-;######### ShowStatement and keyword
123
-show
124
-vis
125
-;######### ListVariablesStatement and keyword
126
-vars
127
-var
128
-variables
129
-variabler
130
-;######### DigitsStatement
131
-digits
132
-cifre
133
-;######### InputStatement
134
-input
135
-ind
136
-;######### OutputStatement
137
-output
138
-ud
139
-;######### Binary keyword
140
-bin
141
-bin
142
-binary
143
-bin�r
144
-;######### Octal keyword
145
-oct
146
-okt
147
-octal
148
-oktal
149
-;######### Decimal keyword
150
-dec
151
-dec
152
-decimal
153
-decimal
154
-;######### Hexadecimal keyword
155
-hex
156
-hex
157
-hexadecimal
158
-hexadecimal
159
-;######### AboutStatement and keyword
160
-about
161
-om
162
-;######### LicenseStatement and keyword
163
-license
164
-lisens

+ 0
- 136
catalog/dansk/amath-text.ct View File

@@ -1,136 +0,0 @@
1
-## version $VER: amath-text.catalog 1.60 (08.04.2015) Danish
2
-## language dansk
3
-## codeset 0
4
-; #############################################################################
5
-; Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
6
-; All rights reserved.
7
-; 
8
-; Redistribution and use in source and binary forms, with or without
9
-; modification, are permitted provided that the following conditions are met:
10
-; 
11
-; * Redistributions of source code must retain the above copyright notice, this
12
-;   list of conditions and the following disclaimer.
13
-; 
14
-; * Redistributions in binary form must reproduce the above copyright notice,
15
-;   this list of conditions and the following disclaimer in the documentation
16
-;   and/or other materials provided with the distribution.
17
-; 
18
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19
-; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20
-; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21
-; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22
-; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23
-; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24
-; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25
-; CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26
-; OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27
-; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
-; #############################################################################
29
-INTROMSG
30
-#NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02#Skriv hj�lp for at f� vist uddybende information.#NEWLINE#
31
-STATEMENTLINE
32
----------------------------------------------------------#NEWLINE#
33
-STATEMENTCLEAR
34
-clear      Clear console window.#NEWLINE#
35
-STATEMENTDEF
36
-def        Define function.#NEWLINE#
37
-STATEMENTDELETE
38
-delete     Delete variable or function.#NEWLINE#
39
-STATEMENTDIGITS
40
-digits     Set number of significant digits.#NEWLINE#
41
-STATEMENTEVAL
42
-eval       Evaluate arithmetic expression.#NEWLINE#
43
-STATEMENTEXECUTE
44
-execute    Execute statements in a file.#NEWLINE#
45
-STATEMENTFUNCS
46
-functions  Show list of user defined functions.#NEWLINE#
47
-STATEMENTINPUT
48
-input      Change numeral input system.#NEWLINE#
49
-STATEMENTHELP
50
-help       Show basic help text.#NEWLINE#
51
-STATEMENTOUTPUT
52
-output     Change numeral output system.#NEWLINE#
53
-STATEMENTLIST
54
-list       Show content of a directory.#NEWLINE#
55
-STATEMENTSHOW
56
-show       Show content of a file.#NEWLINE#
57
-STATEMENTLOAD
58
-load       Load variable and functions from file.#NEWLINE#
59
-STATEMENTSAVE
60
-save       Save variable and functions to file.#NEWLINE#
61
-STATEMENTVARS
62
-variables  Show list of variables.#NEWLINE#
63
-STATEMENTVERSION
64
-version    Show version string.#NEWLINE#
65
-STATEMENTMEMORY
66
-memory     Show internal memory usage.#NEWLINE#
67
-STATEMENTEXIT
68
-exit       Exit program.#NEWLINE#
69
-STATEMENTFOOTER
70
-The def and eval statements are optional. Functions and#NEWLINE#variables statements can be shorten to funcs and vars.#NEWLINE#
71
-TXTLISTDIRHEADER
72
- Type       Navn#NEWLINE#-----------------------------------------------#NEWLINE#
73
-TXTLISTDIRTFILE
74
-[fil]
75
-TXTLISTDIRTDIR
76
-[mappe]
77
-TXTLISTDIRTUNKNOWN
78
-[ukendt]
79
-TXTMEMBLOCKS
80
-Allokerede blokke: #SPACE#
81
-TXTMEMSIZE
82
-Hukommelsesforbrug:#SPACE#
83
-TXTMEMMAXSIZE
84
-H�jeste forbrug:   #SPACE#
85
-HELPNOHELP
86
-Der er ingen hj�lp tilg�ngelig om det emne.#NEWLINE#
87
-HELPSYNTAX
88
-Syntaktiske fejl:#SPACE#
89
-HELPUERROR
90
-Uventet fejl:#SPACE#
91
-HELPVARNDEF
92
-Variablen er ikke defineret:#SPACE#
93
-HELPFUNNDEF
94
-Funktionen er ikke defineret:#SPACE#
95
-HELPFUNRDEF
96
-Funktionen er allerede defineret:#SPACE#
97
-HELPPNUMERA
98
-Grundtallet skal v�re mellem 2 og 32:#SPACE#
99
-HELPPDIGITS
100
-Antal betydende cifre skal v�re mellem 0 og 15:#SPACE#
101
-HELPINPUSHOW
102
-Talsystemet n�r computeren l�ser ind er#SPACE#
103
-HELPOUTPSHOW
104
-Talsystemet n�r computeren skriver ud er#SPACE#
105
-HELPINPUSETT
106
-Talsystemet ved indl�sning �ndret til#SPACE#
107
-HELPOUTPSETT
108
-Talsystemet ved udskrivning �ndret til#SPACE#
109
-HELPDIGISETT
110
-Antal betydende cifre �ndret til#SPACE#
111
-HELPDIGISHOW
112
-Antal betydende cifre der vises er#SPACE#
113
-HELPVARSNDEF
114
-Der er ikke defineret nogle variabler.#NEWLINE#
115
-HELPFUNCNDEF
116
-Der er ikke defineret nogle funktioner.#NEWLINE#
117
-HELPLOADSUCC
118
-Variabler og funktioner indl�st fra fil.#NEWLINE#
119
-HELPSAVESUCC
120
-Variabler og funktioner gemt til fil.#NEWLINE#
121
-HELPSAVEFAIL
122
-Kan ikke gemme fil.#NEWLINE#
123
-HELPSAVENOTH
124
-Der er ikke noget og gemme.#NEWLINE#
125
-HELPPREFLOAD
126
-Pr�ferencer blev indl�st.#NEWLINE#
127
-HELPPREFNOLO
128
-Kunne ikke indl�ses pr�ferencer.#NEWLINE#
129
-HELPPREFSAVE
130
-Pr�ferencer blev gemt.#NEWLINE#
131
-HELPPREFNOSA
132
-Kunne ikke gemme pr�ferencer.#NEWLINE#
133
-MSGNODIR
134
-Mappen kan ikke �bnes:#SPACE#
135
-MSGNOFILE
136
-Filen kan ikke �bnes.#NEWLINE#

+ 13
- 18
configure View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 set -e
29 29
 
30
-version="1.7.0"
30
+version="1.7.1"
31 31
 
32 32
 clang=false
33 33
 debugsym=false
@@ -85,9 +85,9 @@ for arg in "$@"; do
85 85
 	--disable-test)
86 86
 		regtest=false;;
87 87
 
88
-	--enable-stdc++)
88
+	--with-stdc++)
89 89
 		gcclib="-lstdc++";;
90
-	--disable-stdc++)
90
+	--without-stdc++)
91 91
 		gcclib="";;
92 92
 
93 93
 	--help)
@@ -104,14 +104,14 @@ for arg in "$@"; do
104 104
 		echo '  --disable-test: do not include regression test'
105 105
 		echo '  --enable-clang: build with clang compiler'
106 106
 		echo '  --disable-clang: do not build with clang compiler'
107
-		echo '  --enable-stdc++: link with stdc++ library'
108
-		echo '  --disable-stdc++: do not link with stdc++ library'
107
+		echo '  --with-stdc++: link with stdc++ library'
108
+		echo '  --without-stdc++: do not link with stdc++ library'
109 109
 		echo
110 110
 		echo '  CFLAGS=<flags>: additional compiler flags'
111 111
 		echo '  CXXFLAGS=<flags>: additional compiler flags'
112 112
 		echo '  LDFLAGS=<flags>: additional linker flags'
113 113
 		echo
114
-		echo 'all invalid options are silently ignored'
114
+		echo 'No warnings are shown for Invalid options.'
115 115
 		exit 0
116 116
 		;;
117 117
 	esac
@@ -161,6 +161,8 @@ SYSSRCS='
161 161
 console.cpp
162 162
 console_amiga.cpp
163 163
 console_stdc.cpp
164
+console_posix.cpp
165
+console_windows.cpp
164 166
 filesystem_amiga.cpp
165 167
 filesystem_stdc.cpp
166 168
 language.cpp
@@ -170,14 +172,13 @@ language_stdc.cpp
170 172
 preferences.cpp
171 173
 preferences_amiga.cpp
172 174
 preferences_stdc.cpp
173
-proc_amiga.cpp
174 175
 program.cpp
175 176
 program_amiga.cpp
177
+program_haiku.cpp
176 178
 program_stdc.cpp
177 179
 program_test.cpp
178
-task_amiga.cpp
179
-task_stdc.cpp
180 180
 window_amiga.cpp
181
+window_haiku.cpp
181 182
 '
182 183
 FUNCTIONSRC='
183 184
 absolute.cpp
@@ -693,7 +694,6 @@ echo "clean:"
693 694
 echo "	\${DEL} static/\${alib} \${solib} ${libc} ${libcs}"
694 695
 echo
695 696
 } >  src/clib/Makefile
696
-
697 697
 #########################################################################
698 698
 
699 699
 ############################# Real Numbers ##############################
@@ -907,13 +907,13 @@ echo "	cd src/lib && \${MAKE}"
907 907
 echo
908 908
 echo "${amath}:"
909 909
 echo "	cd src/real && \${MAKE}"
910
-echo	
910
+echo
911 911
 echo "${amathc}:"
912 912
 echo "	cd src/clib && \${MAKE}"
913
-echo	
913
+echo
914 914
 echo "${amathcplex}:"
915 915
 echo "	cd src/cplex && \${MAKE}"
916
-echo	
916
+echo
917 917
 echo "localize:"
918 918
 echo "	cd build/flexcat && \${MAKE}"
919 919
 echo "	\${FLXCAT} text/keyword.cd src/localize/kword.h=text/keyword.sd"
@@ -927,11 +927,6 @@ echo "	\${MKDIR}  dist/catalog/english"
927 927
 echo "	\${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog"
928 928
 echo "	\${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog"
929 929
 echo "	\${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog"
930
-echo "	\${MKDIR}  dist/catalog/dansk"
931
-echo "	\${FLXCAT} text/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog"
932
-echo "	\${FLXCAT} text/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog"
933
-echo "	\${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog"
934
-echo "	\${FLXCAT} text/keyword.cd catalog/dansk/amath-keyword.ct CATALOG dist/catalog/dansk/amath-keyword.catalog"
935 930
 echo
936 931
 echo "shared-app:	app libs ${program}.o"
937 932
 echo "	\${CC} \${CFLAGS} ${exestrip} ${program}.o -o amath \${LPATH} \${LFLAGS}"

+ 25
- 70
src/amath.h View File

@@ -60,6 +60,12 @@
60 60
 # endif
61 61
 #endif
62 62
 /******************************************************************************/
63
+#ifdef _WIN32
64
+# ifndef WINDOWS
65
+# define WINDOWS
66
+# endif
67
+#endif
68
+/******************************************************************************/
63 69
 #if defined(AOS3) || defined(AOS4) || defined(AROS) || defined (MORPHOS)
64 70
 # ifndef AMIGA
65 71
 # define AMIGA
@@ -72,30 +78,29 @@
72 78
 # endif
73 79
 #endif
74 80
 /******************************************************************************/
75
-#if defined(AMIGA) || defined(HAIKU) || defined(UNIX)
76
-# ifndef ANSICONSOLE
77
-# define ANSICONSOLE
81
+#if defined(HAIKU) || defined(UNIX)
82
+# ifndef POSIX
83
+# define POSIX
78 84
 # endif
79 85
 #endif
80 86
 /******************************************************************************/
81
-#ifdef HAIKU
82
-# include <stdint.h>
83
-# include <unistd.h>
84
-# include <dirent.h>
87
+#if !defined(AMIGA) && !defined(POSIX) && !defined(WINDOWS)
88
+# ifndef STDC_CONSOLE
89
+# define STDC_CONSOLE
90
+# endif
85 91
 #endif
86 92
 /******************************************************************************/
87
-#ifdef UNIX
93
+#if defined(POSIX)
88 94
 # include <stdint.h>
89 95
 # include <unistd.h>
90 96
 # include <dirent.h>
91
-# include <termios.h>
92 97
 #endif
93 98
 /******************************************************************************/
94
-#ifdef _WIN32
99
+#if defined(WINDOWS)
95 100
 # include <stdint.h>
96 101
 #endif
97 102
 /******************************************************************************/
98
-#ifdef AOS3
103
+#if defined(AOS3)
99 104
 # include <sys/types.h>
100 105
 # define IPTR      LONG*
101 106
 # define uintptr_t uint32_t
@@ -110,10 +115,9 @@ typedef u_int64_t  uint64_t;
110 115
 # include <sys/types.h>
111 116
 #endif
112 117
 /******************************************************************************/
113
-#if (__cplusplus <= 199711L && !defined(_WIN32)) || !defined(__cplusplus)
118
+#if (__cplusplus <= 199711L && !defined(WINDOWS)) || !defined(__cplusplus)
114 119
 #define nullptr 0
115
-#endif
116
-#if defined(__GNUC__) || defined(__GNUG__)
120
+#elif (__cplusplus <= 199711L) && (defined(__GNUC__) || defined(__GNUG__))
117 121
 #define nullptr 0
118 122
 #endif
119 123
 /******************************************************************************/
@@ -208,7 +212,7 @@ typedef u_int64_t  uint64_t;
208 212
 #define SPACE       " "
209 213
 #define DOT         "."
210 214
 /******************************************************************************/
211
-#ifdef _WIN32
215
+#ifdef WINDOWS
212 216
 #define NEWLINE     "\r\n"
213 217
 #else
214 218
 #define NEWLINE     "\n"
@@ -272,30 +276,22 @@ typedef int bool;
272 276
 # define TXTFPU EMPTYSTRING
273 277
 #endif
274 278
 /******************************************************************************/
275
-#if defined(WITHTEST) && !defined(ANSICONSOLE)
276
-# define TXTOPTS         "TEST"
277
-#endif
278
-#if !defined(WITHTEST) && defined(ANSICONSOLE)
279
-# define TXTOPTS         "ANSI"
280
-#endif
281
-#if defined(WITHTEST) && defined(ANSICONSOLE)
282
-# define TXTOPTS         "ANSI, TEST"
283
-#endif
284
-#ifdef TXTOPTS
285
-# define TXTOPTMSG       SPACE "(OPT: " TXTOPTS ")"
279
+#if defined(WITHTEST)
280
+# define TXTOPTMSG       SPACE "(test)"
286 281
 #else
287 282
 # define TXTOPTMSG       EMPTYSTRING
288 283
 #endif
289 284
 /******************************************************************************/
290 285
 #define TXTARCH          TXTCPU TXTFPU
291
-#define RELDATESTAMP     "(12-03-2017)"
292
-#define TXTDOSVERSION    "\0$VER: amath 1.70" SPACE RELDATESTAMP SPACE TXTARCH
293
-#define TXTTITLE         "amath version 1.7.0"
286
+#define RELDATESTAMP     "(10-04-2017)"
287
+#define TXTDOSVERSION    "\0$VER: amath 1.71" SPACE RELDATESTAMP SPACE TXTARCH
288
+#define TXTTITLE         "amath version 1.7.1"
294 289
 #define TXTCOPYRIGHT     "(c) 2017 Carsten Sonne Larsen"
295 290
 #define TXTSTARTMSG      TXTTITLE SPACE TXTCOPYRIGHT
296 291
 /******************************************************************************/
297 292
 #define TXTVERSMSG       TXTTITLE SPACE RELDATESTAMP SPACE TXTARCH
298 293
 #define TXTCOMPMSG       "Compiled with " COMP_NAME SPACE COMP_VERS TXTOPTMSG
294
+#define TXTCOMPSHTMSG    "Compiled with " COMP_NAME SPACE COMP_VERS
299 295
 /******************************************************************************/
300 296
 #define CPROCNAME        "amath_console"
301 297
 /******************************************************************************/
@@ -318,45 +314,4 @@ typedef int bool;
318 314
 #define CATALOG_DEF      OC_BuiltInLanguage, "english"
319 315
 #endif
320 316
 /******************************************************************************/
321
-#if defined(ANSICONSOLE)
322
-#define HEADLINE         "\x1B[1m"
323
-#ifdef UNIX
324
-#define SYNTAXHIGHLIGHT  "\x1B[3m\x1B[32m"
325
-#else
326
-#define SYNTAXHIGHLIGHT  "\x1B[32m"
327
-#endif
328
-#define NORMALTEXT       "\x1B[0m"
329
-#define BOLD             "\x1B[1m"
330
-#define ITALICS          "\x1B[3m"
331
-#define UNDERLINE        "\x1B[4m"
332
-#define COLOR01          "\x1B[31m"
333
-#define COLOR02          "\x1B[32m"
334
-#define COLOR03          "\x1B[33m"
335
-#define CURSORFORWARD    "\x1B[1C"
336
-#define CURSORBACKWARD   "\x1B[1D"
337
-#define ERASEINLINE      "\x1B[K"
338
-#define INSERT1CHAR      "\x1B[1@"
339
-#define DELETE1CHAR      "\x1B[1P"
340
-#define DELETELINE       "\x0D\x1B[K"
341
-#define CLEARWINDOW      "\x1B[1;1H\x1B[J"
342
-/******************************************************************************/
343
-#else
344
-#define HEADLINE         EMPTYSTRING
345
-#define SYNTAXHIGHLIGHT  EMPTYSTRING
346
-#define NORMALTEXT       EMPTYSTRING
347
-#define BOLD             EMPTYSTRING
348
-#define ITALICS          EMPTYSTRING
349
-#define UNDERLINE        EMPTYSTRING
350
-#define COLOR01          EMPTYSTRING
351
-#define COLOR02          EMPTYSTRING
352
-#define COLOR03          EMPTYSTRING
353
-#define CURSORFORWARD    EMPTYSTRING
354
-#define CURSORBACKWARD   EMPTYSTRING
355
-#define ERASEINLINE      EMPTYSTRING
356
-#define INSERT1CHAR      EMPTYSTRING
357
-#define DELETE1CHAR      EMPTYSTRING
358
-#define DELETELINE       EMPTYSTRING
359
-#define CLEARWINDOW      EMPTYSTRING
360
-#endif
361
-/******************************************************************************/
362 317
 #endif

+ 0
- 28
src/amath.sln View File

@@ -1,28 +0,0 @@
1
-
2
-Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 15
4
-VisualStudioVersion = 15.0.26228.4
5
-MinimumVisualStudioVersion = 10.0.40219.1
6
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amath", "amath.vcxproj", "{834DBB3E-042B-41E5-9400-EEC16CF003C7}"
7
-EndProject
8
-Global
9
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
10
-		Debug|x64 = Debug|x64
11
-		Debug|x86 = Debug|x86
12
-		Release|x64 = Release|x64
13
-		Release|x86 = Release|x86
14
-	EndGlobalSection
15
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
16
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Debug|x64.ActiveCfg = Debug|x64
17
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Debug|x64.Build.0 = Debug|x64
18
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Debug|x86.ActiveCfg = Debug|Win32
19
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Debug|x86.Build.0 = Debug|Win32
20
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Release|x64.ActiveCfg = Release|x64
21
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Release|x64.Build.0 = Release|x64
22
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Release|x86.ActiveCfg = Release|Win32
23
-		{834DBB3E-042B-41E5-9400-EEC16CF003C7}.Release|x86.Build.0 = Release|Win32
24
-	EndGlobalSection
25
-	GlobalSection(SolutionProperties) = preSolution
26
-		HideSolutionNode = FALSE
27
-	EndGlobalSection
28
-EndGlobal

+ 0
- 146
src/amath.vcxproj View File

@@ -1,146 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup Label="ProjectConfigurations">
4
-    <ProjectConfiguration Include="Debug|Win32">
5
-      <Configuration>Debug</Configuration>
6
-      <Platform>Win32</Platform>
7
-    </ProjectConfiguration>
8
-    <ProjectConfiguration Include="Release|Win32">
9
-      <Configuration>Release</Configuration>
10
-      <Platform>Win32</Platform>
11
-    </ProjectConfiguration>
12
-    <ProjectConfiguration Include="Debug|x64">
13
-      <Configuration>Debug</Configuration>
14
-      <Platform>x64</Platform>
15
-    </ProjectConfiguration>
16
-    <ProjectConfiguration Include="Release|x64">
17
-      <Configuration>Release</Configuration>
18
-      <Platform>x64</Platform>
19
-    </ProjectConfiguration>
20
-  </ItemGroup>
21
-  <PropertyGroup Label="Globals">
22
-    <VCProjectVersion>15.0</VCProjectVersion>
23
-    <ProjectGuid>{834DBB3E-042B-41E5-9400-EEC16CF003C7}</ProjectGuid>
24
-    <Keyword>Win32Proj</Keyword>
25
-    <RootNamespace>amath</RootNamespace>
26
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
27
-  </PropertyGroup>
28
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
30
-    <ConfigurationType>Application</ConfigurationType>
31
-    <UseDebugLibraries>true</UseDebugLibraries>
32
-    <PlatformToolset>v141</PlatformToolset>
33
-    <CharacterSet>Unicode</CharacterSet>
34
-  </PropertyGroup>
35
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36
-    <ConfigurationType>Application</ConfigurationType>
37
-    <UseDebugLibraries>false</UseDebugLibraries>
38
-    <PlatformToolset>v141</PlatformToolset>
39
-    <WholeProgramOptimization>true</WholeProgramOptimization>
40
-    <CharacterSet>Unicode</CharacterSet>
41
-  </PropertyGroup>
42
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43
-    <ConfigurationType>Application</ConfigurationType>
44
-    <UseDebugLibraries>true</UseDebugLibraries>
45
-    <PlatformToolset>v141</PlatformToolset>
46
-    <CharacterSet>Unicode</CharacterSet>
47
-  </PropertyGroup>
48
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
49
-    <ConfigurationType>Application</ConfigurationType>
50
-    <UseDebugLibraries>false</UseDebugLibraries>
51
-    <PlatformToolset>v141</PlatformToolset>
52
-    <WholeProgramOptimization>true</WholeProgramOptimization>
53
-    <CharacterSet>Unicode</CharacterSet>
54
-  </PropertyGroup>
55
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
56
-  <ImportGroup Label="ExtensionSettings">
57
-  </ImportGroup>
58
-  <ImportGroup Label="Shared">
59
-  </ImportGroup>
60
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62
-  </ImportGroup>
63
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65
-  </ImportGroup>
66
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68
-  </ImportGroup>
69
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
70
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71
-  </ImportGroup>
72
-  <PropertyGroup Label="UserMacros" />
73
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74
-    <LinkIncremental>true</LinkIncremental>
75
-  </PropertyGroup>
76
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
77
-    <LinkIncremental>true</LinkIncremental>
78
-  </PropertyGroup>
79
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
80
-    <LinkIncremental>false</LinkIncremental>
81
-  </PropertyGroup>
82
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
83
-    <LinkIncremental>false</LinkIncremental>
84
-  </PropertyGroup>
85
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86
-    <ClCompile>
87
-      <PrecompiledHeader>
88
-      </PrecompiledHeader>
89
-      <WarningLevel>Level3</WarningLevel>
90
-      <Optimization>Disabled</Optimization>
91
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92
-    </ClCompile>
93
-    <Link>
94
-      <SubSystem>Console</SubSystem>
95
-    </Link>
96
-  </ItemDefinitionGroup>
97
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
98
-    <ClCompile>
99
-      <PrecompiledHeader>
100
-      </PrecompiledHeader>
101
-      <WarningLevel>Level3</WarningLevel>
102
-      <Optimization>Disabled</Optimization>
103
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104
-    </ClCompile>
105
-    <Link>
106
-      <SubSystem>Console</SubSystem>
107
-    </Link>
108
-  </ItemDefinitionGroup>
109
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
110
-    <ClCompile>
111
-      <WarningLevel>Level3</WarningLevel>
112
-      <PrecompiledHeader>
113
-      </PrecompiledHeader>
114
-      <Optimization>MaxSpeed</Optimization>
115
-      <FunctionLevelLinking>true</FunctionLevelLinking>
116
-      <IntrinsicFunctions>true</IntrinsicFunctions>
117
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118
-    </ClCompile>
119
-    <Link>
120
-      <SubSystem>Console</SubSystem>
121
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
122
-      <OptimizeReferences>true</OptimizeReferences>
123
-    </Link>
124
-  </ItemDefinitionGroup>
125
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
126
-    <ClCompile>
127
-      <WarningLevel>Level3</WarningLevel>
128
-      <PrecompiledHeader>
129
-      </PrecompiledHeader>
130
-      <Optimization>MaxSpeed</Optimization>
131
-      <FunctionLevelLinking>true</FunctionLevelLinking>
132
-      <IntrinsicFunctions>true</IntrinsicFunctions>
133
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134
-    </ClCompile>
135
-    <Link>
136
-      <SubSystem>Console</SubSystem>
137
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
138
-      <OptimizeReferences>true</OptimizeReferences>
139
-    </Link>
140
-  </ItemDefinitionGroup>
141
-  <ItemGroup>
142
-  </ItemGroup>
143
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
144
-  <ImportGroup Label="ExtensionTargets">
145
-  </ImportGroup>
146
-</Project>

+ 0
- 17
src/amath.vcxproj.filters View File

@@ -1,17 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup>
4
-    <Filter Include="Source Files">
5
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7
-    </Filter>
8
-    <Filter Include="Header Files">
9
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11
-    </Filter>
12
-    <Filter Include="Resource Files">
13
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15
-    </Filter>
16
-  </ItemGroup>
17
-</Project>

+ 1
- 0
src/amathc.h View File

@@ -51,6 +51,7 @@ typedef struct
51 51
 
52 52
 void* AllocMemSafe(size_t);
53 53
 void FreeMemSafe(void*);
54
+void DetachMemSafe(void*);
54 55
 void FreeAllSafe();
55 56
 void MemUsage(long*, long*, long*);
56 57
 

+ 0
- 104
src/clib/Makefile View File

@@ -1,104 +0,0 @@
1
-CC        = gcc
2
-CFLAGS    = -std=c9x -O3 -DWITHTEST -I. -I.. -Wall
3
-AR        = ar
4
-RANLIB    = ranlib
5
-MKDIR     = mkdir -p
6
-DEL       = rm -f
7
-INSTALL   = install -m 0644
8
-LDCONFIG  = ldconfig
9
-PREFIX    = /usr
10
-INSTDIR   = ${DESTDIR}${PREFIX}/lib/amath
11
-INSTDIRI  = ${DESTDIR}${PREFIX}/include/amath
12
-INSTDIRPC = ${DESTDIR}${PREFIX}/lib/pkgconfig
13
-INSTDIRM  = ${DESTDIR}${PREFIX}/share/man/man3
14
-alib      = libamathc.a
15
-solib     = libamathc.so
16
-pkgconfig = amathc.pc
17
-manpage   = amathc.3
18
-
19
-all: static shared
20
-
21
-static: ${alib}
22
-
23
-shared: ${solib}
24
-
25
-static/alloccpy.o:	alloccpy.c
26
-	${CC} ${CFLAGS} -fno-builtin -c alloccpy.c -o static/alloccpy.o
27
-
28
-shared/alloccpy.o:	alloccpy.c
29
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c alloccpy.c -o shared/alloccpy.o
30
-
31
-static/mem.o:	mem.c
32
-	${CC} ${CFLAGS} -fno-builtin -c mem.c -o static/mem.o
33
-
34
-shared/mem.o:	mem.c
35
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c mem.c -o shared/mem.o
36
-
37
-static/memcpy.o:	memcpy.c
38
-	${CC} ${CFLAGS} -fno-builtin -c memcpy.c -o static/memcpy.o
39
-
40
-shared/memcpy.o:	memcpy.c
41
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c memcpy.c -o shared/memcpy.o
42
-
43
-static/memset.o:	memset.c
44
-	${CC} ${CFLAGS} -fno-builtin -c memset.c -o static/memset.o
45
-
46
-shared/memset.o:	memset.c
47
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c memset.c -o shared/memset.o
48
-
49
-static/strcmp.o:	strcmp.c
50
-	${CC} ${CFLAGS} -fno-builtin -c strcmp.c -o static/strcmp.o
51
-
52
-shared/strcmp.o:	strcmp.c
53
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c strcmp.c -o shared/strcmp.o
54
-
55
-static/strlen.o:	strlen.c
56
-	${CC} ${CFLAGS} -fno-builtin -c strlen.c -o static/strlen.o
57
-
58
-shared/strlen.o:	strlen.c
59
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c strlen.c -o shared/strlen.o
60
-
61
-static/untag.o:	untag.c
62
-	${CC} ${CFLAGS} -fno-builtin -c untag.c -o static/untag.o
63
-
64
-shared/untag.o:	untag.c
65
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c untag.c -o shared/untag.o
66
-
67
-.PHONY: build
68
-build:
69
-	${MKDIR} static
70
-	${MKDIR} shared
71
-
72
-${solib}:	build  shared/alloccpy.o shared/mem.o shared/memcpy.o shared/memset.o shared/strcmp.o shared/strlen.o shared/untag.o
73
-	${CC} ${CFLAGS} -shared -s -fPIC -Wl,-soname,${solib}.1.7.0 -o ${solib}  shared/alloccpy.o shared/mem.o shared/memcpy.o shared/memset.o shared/strcmp.o shared/strlen.o shared/untag.o -lc
74
-
75
-${alib}:	build  static/alloccpy.o static/mem.o static/memcpy.o static/memset.o static/strcmp.o static/strlen.o static/untag.o
76
-	${AR} rcs static/${alib}  static/alloccpy.o static/mem.o static/memcpy.o static/memset.o static/strcmp.o static/strlen.o static/untag.o
77
-	${RANLIB} static/${alib}
78
-
79
-.PHONY: install
80
-install:	${alib} ${solib}
81
-	${MKDIR} ${INSTDIR}
82
-	${MKDIR} ${INSTDIRPC}
83
-	${MKDIR} ${INSTDIRI}
84
-	${INSTALL} static/${alib} ${INSTDIR}/${alib}
85
-	${INSTALL} ${solib} ${INSTDIR}/${solib}
86
-	${INSTALL} ${pkgconfig} ${INSTDIRPC}/${pkgconfig}
87
-	${INSTALL} ${manpage} ${INSTDIRM}/${manpage}
88
-	${INSTALL} ../amath.h ${INSTDIRI}
89
-	${INSTALL} ../amathc.h ${INSTDIRI}
90
-	${LDCONFIG} ${INSTDIR}
91
-
92
-.PHONY:	uninstall
93
-uninstall:
94
-	${DEL} ${INSTDIR}/${alib}
95
-	${DEL} ${INSTDIR}/${solib}
96
-	${DEL} ${INSTDIRPC}/${pkgconfig}
97
-	${DEL} ${INSTDIRM}/${manpage}
98
-	${DEL} ${INSTDIRI}/amath.h
99
-	${DEL} ${INSTDIRI}/amathc.h
100
-	${LDCONFIG}
101
-
102
-clean:
103
-	${DEL} static/${alib} ${solib}  static/alloccpy.o static/mem.o static/memcpy.o static/memset.o static/strcmp.o static/strlen.o static/untag.o  shared/alloccpy.o shared/mem.o shared/memcpy.o shared/memset.o shared/strcmp.o shared/strlen.o shared/untag.o
104
-

+ 14
- 21
src/clib/amathc.3 View File

@@ -1,4 +1,4 @@
1
-.TH "amath/amathc.h" 3 "Wed Mar 1 2017" "Version 1.7.0" "amath" \" -*- nroff -*-
1
+.TH "amath/amathc.h" 3 "Wed Mar 1 2017" "Version 1.7.1" "amath" \" -*- nroff -*-
2 2
 .ad l
3 3
 .nh
4 4
 .SH NAME
@@ -100,12 +100,8 @@ Definition at line 40 of file alloccpy\&.c\&.
100 100
 58     *destination = AllocMemSafe(size);
101 101
 59     d = *destination;
102 102
 60 
103
-61 #ifdef AMIGA // Take advantage of exec
104
-62     CopyMem(s, d, n);
105
-63 #else
106 103
 64     while (n--)
107 104
 65         *d++ = *s++;
108
-66 #endif
109 105
 67 
110 106
 68     return size;
111 107
 69 }
@@ -122,7 +118,7 @@ Definition at line 86 of file mem\&.c\&.
122 118
 88     struct MemoryBlock* newblock;
123 119
 89     size_t allocsize;
124 120
 90 
125
-91     if (list == NULL)
121
+91     if (list == nullptr)
126 122
 92     {
127 123
 93         list = (struct MemoryList*)ALLOC_MEM(sizeof(struct MemoryList));
128 124
 94         if (!list)
@@ -131,7 +127,7 @@ Definition at line 86 of file mem\&.c\&.
131 127
 97             return 0;
132 128
 98         }
133 129
 99 
134
-100         list->first = NULL;
130
+100         list->first = nullptr;
135 131
 101         list->peak = 0;
136 132
 102         list->size = 0;
137 133
 103         list->count = 0;
@@ -186,13 +182,13 @@ Definition at line 199 of file mem\&.c\&.
186 182
 200 {
187 183
 201     struct MemoryBlock *current, *next;
188 184
 202 
189
-203     if (list == NULL)
185
+203     if (list == nullptr)
190 186
 204     {
191 187
 205         return;
192 188
 206     }
193 189
 207 
194 190
 208     current = list->first;
195
-209     while (current != NULL)
191
+209     while (current != nullptr)
196 192
 210     {
197 193
 211         next = current->next;
198 194
 212         FREE_MEM(current->address);
@@ -201,7 +197,7 @@ Definition at line 199 of file mem\&.c\&.
201 197
 215     }
202 198
 216 
203 199
 217     FREE_MEM(list);
204
-218     list = NULL;
200
+218     list = nullptr;
205 201
 219 }
206 202
 .fi
207 203
 .SS "void FreeMemSafe (void *)"
@@ -215,33 +211,33 @@ Definition at line 147 of file mem\&.c\&.
215 211
 148 {
216 212
 149     struct MemoryBlock *current, *previous;
217 213
 150 
218
-151     if (list == NULL || block == NULL)
214
+151     if (list == nullptr || block == nullptr)
219 215
 152     {
220 216
 153         dealloc_error("list", 0);
221 217
 154         return;
222 218
 155     }
223 219
 156 
224
-157     if (block == NULL)
220
+157     if (block == nullptr)
225 221
 158     {
226 222
 159         dealloc_error("memory", 0);
227 223
 160         return;
228 224
 161     }
229 225
 162 
230
-163     previous = NULL;
226
+163     previous = nullptr;
231 227
 164     current = list->first;
232
-165     while (current != NULL && current->address != block)
228
+165     while (current != nullptr && current->address != block)
233 229
 166     {
234 230
 167         previous = current;
235 231
 168         current = current->next;
236 232
 169     }
237 233
 170 
238
-171     if (current == NULL)
234
+171     if (current == nullptr)
239 235
 172     {
240 236
 173         dealloc_error("address not found", block);
241 237
 174         return;
242 238
 175     }
243 239
 176 
244
-177     if (previous == NULL)
240
+177     if (previous == nullptr)
245 241
 178     {
246 242
 179         list->first = current->next;
247 243
 180     }
@@ -254,8 +250,8 @@ Definition at line 147 of file mem\&.c\&.
254 250
 187     list->count--;
255 251
 188 
256 252
 189     FREE_MEM(current->address);
257
-190     current->address = NULL;
258
-191     current->next = NULL;
253
+190     current->address = nullptr;
254
+191     current->next = nullptr;
259 255
 192     current->size = 0;
260 256
 193     FREE_MEM(current);
261 257
 194 }
@@ -279,9 +275,6 @@ Definition at line 77 of file memcpy\&.c\&.
279 275
 86     if ((mem_ptr)dst < (mem_ptr)src)
280 276
 87     {
281 277
 88         // Copy forward
282
-89 #ifdef AMIGA // Take advantage of exec
283
-90         CopyMem((void*)source, destination, length);
284
-91 #else
285 278
 92         t = (mem_ptr)src; // only need low bits
286 279
 93         if ((t | (mem_ptr)dst) & wmask)
287 280
 94         {

+ 1
- 1
src/clib/amathc.pc View File

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
5 5
 
6 6
 Name: amath C library
7 7
 Description: C functions for manipulating strings and memory
8
-Version: 1.7.0
8
+Version: 1.7.1
9 9
 Cflags: -I${includedir}
10 10
 Libs: -L${libdir} -lamathc

+ 0
- 113
src/clib/amathc.vcxproj View File

@@ -1,113 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup Label="ProjectConfigurations">
4
-    <ProjectConfiguration Include="Debug|Win32">
5
-      <Configuration>Debug</Configuration>
6
-      <Platform>Win32</Platform>
7
-    </ProjectConfiguration>
8
-    <ProjectConfiguration Include="Release|Win32">
9
-      <Configuration>Release</Configuration>
10
-      <Platform>Win32</Platform>
11
-    </ProjectConfiguration>
12
-    <ProjectConfiguration Include="Debug|x64">
13
-      <Configuration>Debug</Configuration>
14
-      <Platform>x64</Platform>
15
-    </ProjectConfiguration>
16
-    <ProjectConfiguration Include="Release|x64">
17
-      <Configuration>Release</Configuration>
18
-      <Platform>x64</Platform>
19
-    </ProjectConfiguration>
20
-  </ItemGroup>
21
-  <PropertyGroup Label="Globals">
22
-    <VCProjectVersion>15.0</VCProjectVersion>
23
-    <ProjectGuid>{01757088-637B-45D8-B042-14B76DF11115}</ProjectGuid>
24
-    <Keyword>Win32Proj</Keyword>
25
-  </PropertyGroup>
26
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28
-    <ConfigurationType>StaticLibrary</ConfigurationType>
29
-    <UseDebugLibraries>true</UseDebugLibraries>
30
-    <PlatformToolset>v141</PlatformToolset>
31
-  </PropertyGroup>
32
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
33
-    <ConfigurationType>StaticLibrary</ConfigurationType>
34
-    <UseDebugLibraries>false</UseDebugLibraries>
35
-    <PlatformToolset>v141</PlatformToolset>
36
-  </PropertyGroup>
37
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
38
-    <ConfigurationType>Application</ConfigurationType>
39
-    <UseDebugLibraries>true</UseDebugLibraries>
40
-    <PlatformToolset>v141</PlatformToolset>
41
-  </PropertyGroup>
42
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43
-    <ConfigurationType>Application</ConfigurationType>
44
-    <UseDebugLibraries>false</UseDebugLibraries>
45
-    <PlatformToolset>v141</PlatformToolset>
46
-  </PropertyGroup>
47
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48
-  <ImportGroup Label="ExtensionSettings">
49
-  </ImportGroup>
50
-  <ImportGroup Label="Shared">
51
-  </ImportGroup>
52
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
53
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54
-  </ImportGroup>
55
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
56
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57
-  </ImportGroup>
58
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
59
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60
-  </ImportGroup>
61
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
62
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
-  </ImportGroup>
64
-  <PropertyGroup Label="UserMacros" />
65
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66
-    <LinkIncremental>true</LinkIncremental>
67
-  </PropertyGroup>
68
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69
-    <LinkIncremental>true</LinkIncremental>
70
-  </PropertyGroup>
71
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
72
-    <ClCompile>
73
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
75
-      <WarningLevel>Level3</WarningLevel>
76
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
77
-      <Optimization>Disabled</Optimization>
78
-      <AdditionalIncludeDirectories>$(ProjectDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79
-    </ClCompile>
80
-    <Link>
81
-      <TargetMachine>MachineX86</TargetMachine>
82
-      <GenerateDebugInformation>true</GenerateDebugInformation>
83
-      <SubSystem>Windows</SubSystem>
84
-    </Link>
85
-  </ItemDefinitionGroup>
86
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87
-    <ClCompile>
88
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
90
-      <WarningLevel>Level3</WarningLevel>
91
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
92
-    </ClCompile>
93
-    <Link>
94
-      <TargetMachine>MachineX86</TargetMachine>
95
-      <GenerateDebugInformation>true</GenerateDebugInformation>
96
-      <SubSystem>Windows</SubSystem>
97
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
98
-      <OptimizeReferences>true</OptimizeReferences>
99
-    </Link>
100
-  </ItemDefinitionGroup>
101
-  <ItemGroup>
102
-    <ClCompile Include="alloccpy.c" />
103
-    <ClCompile Include="mem.c" />
104
-    <ClCompile Include="memcpy.c" />
105
-    <ClCompile Include="memset.c" />
106
-    <ClCompile Include="strcmp.c" />
107
-    <ClCompile Include="strlen.c" />
108
-    <ClCompile Include="untag.c" />
109
-  </ItemGroup>
110
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
111
-  <ImportGroup Label="ExtensionTargets">
112
-  </ImportGroup>
113
-</Project>

+ 0
- 40
src/clib/amathc.vcxproj.filters View File

@@ -1,40 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup>
4
-    <Filter Include="Source Files">
5
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7
-    </Filter>
8
-    <Filter Include="Header Files">
9
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11
-    </Filter>
12
-    <Filter Include="Resource Files">
13
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
15
-    </Filter>
16
-  </ItemGroup>
17
-  <ItemGroup>
18
-    <ClCompile Include="untag.c">
19
-      <Filter>Source Files</Filter>
20
-    </ClCompile>
21
-    <ClCompile Include="strlen.c">
22
-      <Filter>Source Files</Filter>
23
-    </ClCompile>
24
-    <ClCompile Include="mem.c">
25
-      <Filter>Source Files</Filter>
26
-    </ClCompile>
27
-    <ClCompile Include="alloccpy.c">
28
-      <Filter>Source Files</Filter>
29
-    </ClCompile>
30
-    <ClCompile Include="memcpy.c">
31
-      <Filter>Source Files</Filter>
32
-    </ClCompile>
33
-    <ClCompile Include="memset.c">
34
-      <Filter>Source Files</Filter>
35
-    </ClCompile>
36
-    <ClCompile Include="strcmp.c">
37
-      <Filter>Source Files</Filter>
38
-    </ClCompile>
39
-  </ItemGroup>
40
-</Project>

+ 37
- 19
src/clib/mem.c View File

@@ -75,7 +75,7 @@ struct MemoryList
75 75
 /**
76 76
  * @brief Global list of allocated memory.
77 77
  */
78
-struct MemoryList* list = NULL;
78
+struct MemoryList* list = nullptr;
79 79
 
80 80
 void alloc_error(char*, size_t);
81 81
 void dealloc_error(char*, void*);
@@ -88,7 +88,7 @@ void* AllocMemSafe(size_t size)
88 88
     struct MemoryBlock* newblock;
89 89
     size_t allocsize;
90 90
 
91
-    if (list == NULL)
91
+    if (list == nullptr)
92 92
     {
93 93
         list = (struct MemoryList*)ALLOC_MEM(sizeof(struct MemoryList));
94 94
         if (!list)
@@ -97,7 +97,7 @@ void* AllocMemSafe(size_t size)
97 97
             return 0;
98 98
         }
99 99
 
100
-        list->first = NULL;
100
+        list->first = nullptr;
101 101
         list->peak = 0;
102 102
         list->size = 0;
103 103
         list->count = 0;
@@ -141,40 +141,37 @@ void* AllocMemSafe(size_t size)
141 141
     return newblock->address;
142 142
 }
143 143
 
144
-/**
145
- * @brief Deallocate memory from the global memory list.
146
- */
147
-void FreeMemSafe(void* block)
144
+void RemoveMemSafe(void* block, bool deallocate)
148 145
 {
149 146
     struct MemoryBlock *current, *previous;
150 147
 
151
-    if (list == NULL || block == NULL)
148
+    if (list == nullptr || block == nullptr)
152 149
     {
153 150
         dealloc_error("list", 0);
154 151
         return;
155 152
     }
156 153
 
157
-    if (block == NULL)
154
+    if (block == nullptr)
158 155
     {
159 156
         dealloc_error("memory", 0);
160 157
         return;
161 158
     }
162 159
 
163
-    previous = NULL;
160
+    previous = nullptr;
164 161
     current = list->first;
165
-    while (current != NULL && current->address != block)
162
+    while (current != nullptr && current->address != block)
166 163
     {
167 164
         previous = current;
168 165
         current = current->next;
169 166
     }
170 167
 
171
-    if (current == NULL)
168
+    if (current == nullptr)
172 169
     {
173 170
         dealloc_error("address not found", block);
174 171
         return;
175 172
     }
176 173
 
177
-    if (previous == NULL)
174
+    if (previous == nullptr)
178 175
     {
179 176
         list->first = current->next;
180 177
     }
@@ -186,13 +183,34 @@ void FreeMemSafe(void* block)
186 183
     list->size -= current->size;
187 184
     list->count--;
188 185
 
189
-    FREE_MEM(current->address);
190
-    current->address = NULL;
191
-    current->next = NULL;
186
+    if (deallocate)
187
+    {
188
+        FREE_MEM(current->address);
189
+    }
190
+
191
+    current->address = nullptr;
192
+    current->next = nullptr;
192 193
     current->size = 0;
193 194
     FREE_MEM(current);
194 195
 }
195 196
 
197
+/**
198
+ * @brief Deallocate memory from the global memory list.
199
+ */
200
+void FreeMemSafe(void* block)
201
+{
202
+    RemoveMemSafe(block, true);
203
+}
204
+
205
+/**
206
+ * @brief   Detach an allocated memory from the global memory list.
207
+ * @details The memory block is only detached, not deallocated.
208
+ */
209
+void DetachMemSafe(void* block)
210
+{
211
+    RemoveMemSafe(block, false);
212
+}
213
+
196 214
 /**
197 215
  * @brief Deallocate all memory in the global memory list.
198 216
  */
@@ -200,13 +218,13 @@ void FreeAllSafe()
200 218
 {
201 219
     struct MemoryBlock *current, *next;
202 220
 
203
-    if (list == NULL)
221
+    if (list == nullptr)
204 222
     {
205 223
         return;
206 224
     }
207 225
 
208 226
     current = list->first;
209
-    while (current != NULL)
227
+    while (current != nullptr)
210 228
     {
211 229
         next = current->next;
212 230
         FREE_MEM(current->address);
@@ -215,7 +233,7 @@ void FreeAllSafe()
215 233
     }
216 234
 
217 235
     FREE_MEM(list);
218
-    list = NULL;
236
+    list = nullptr;
219 237
 }
220 238
 
221 239
 /**

+ 0
- 259
src/cplex/Makefile View File

@@ -1,259 +0,0 @@
1
-CC        = gcc
2
-CFLAGS    = -std=c9x -O3 -DWITHTEST  -I. -I.. -Wall
3
-AR        = ar
4
-RANLIB    = ranlib
5
-MKDIR     = mkdir -p
6
-DEL       = rm -f
7
-INSTALL   = install -m 0644
8
-LDCONFIG  = ldconfig
9
-PREFIX    = /usr
10
-INSTDIR   = ${DESTDIR}${PREFIX}/lib/amath
11
-INSTDIRI  = ${DESTDIR}${PREFIX}/include/amath
12
-INSTDIRPC = ${DESTDIR}${PREFIX}/lib/pkgconfig
13
-INSTDIRM  = ${DESTDIR}${PREFIX}/share/man/man3
14
-alib      = libamathcplex.a
15
-solib     = libamathcplex.so
16
-pkgconfig = amathi.pc
17
-manpage   = amathi.3
18
-
19
-all: static shared
20
-
21
-static: ${alib}
22
-
23
-shared: ${solib}
24
-
25
-static/cacos.o:	cacos.c
26
-	${CC} ${CFLAGS} -fno-builtin -c cacos.c -o static/cacos.o
27
-
28
-shared/cacos.o:	cacos.c
29
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cacos.c -o shared/cacos.o
30
-
31
-static/cacosh.o:	cacosh.c
32
-	${CC} ${CFLAGS} -fno-builtin -c cacosh.c -o static/cacosh.o
33
-
34
-shared/cacosh.o:	cacosh.c
35
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cacosh.c -o shared/cacosh.o
36
-
37
-static/cacot.o:	cacot.c
38
-	${CC} ${CFLAGS} -fno-builtin -c cacot.c -o static/cacot.o
39
-
40
-shared/cacot.o:	cacot.c
41
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cacot.c -o shared/cacot.o
42
-
43
-static/cacoth.o:	cacoth.c
44
-	${CC} ${CFLAGS} -fno-builtin -c cacoth.c -o static/cacoth.o
45
-
46
-shared/cacoth.o:	cacoth.c
47
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cacoth.c -o shared/cacoth.o
48
-
49
-static/cacsc.o:	cacsc.c
50
-	${CC} ${CFLAGS} -fno-builtin -c cacsc.c -o static/cacsc.o
51
-
52
-shared/cacsc.o:	cacsc.c
53
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cacsc.c -o shared/cacsc.o
54
-
55
-static/cacsch.o:	cacsch.c
56
-	${CC} ${CFLAGS} -fno-builtin -c cacsch.c -o static/cacsch.o
57
-
58
-shared/cacsch.o:	cacsch.c
59
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cacsch.c -o shared/cacsch.o
60
-
61
-static/casec.o:	casec.c
62
-	${CC} ${CFLAGS} -fno-builtin -c casec.c -o static/casec.o
63
-
64
-shared/casec.o:	casec.c
65
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c casec.c -o shared/casec.o
66
-
67
-static/casech.o:	casech.c
68
-	${CC} ${CFLAGS} -fno-builtin -c casech.c -o static/casech.o
69
-
70
-shared/casech.o:	casech.c
71
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c casech.c -o shared/casech.o
72
-
73
-static/casin.o:	casin.c
74
-	${CC} ${CFLAGS} -fno-builtin -c casin.c -o static/casin.o
75
-
76
-shared/casin.o:	casin.c
77
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c casin.c -o shared/casin.o
78
-
79
-static/casinh.o:	casinh.c
80
-	${CC} ${CFLAGS} -fno-builtin -c casinh.c -o static/casinh.o
81
-
82
-shared/casinh.o:	casinh.c
83
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c casinh.c -o shared/casinh.o
84
-
85
-static/catan.o:	catan.c
86
-	${CC} ${CFLAGS} -fno-builtin -c catan.c -o static/catan.o
87
-
88
-shared/catan.o:	catan.c
89
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c catan.c -o shared/catan.o
90
-
91
-static/catanh.o:	catanh.c
92
-	${CC} ${CFLAGS} -fno-builtin -c catanh.c -o static/catanh.o
93
-
94
-shared/catanh.o:	catanh.c
95
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c catanh.c -o shared/catanh.o
96
-
97
-static/ccbrt.o:	ccbrt.c
98
-	${CC} ${CFLAGS} -fno-builtin -c ccbrt.c -o static/ccbrt.o
99
-
100
-shared/ccbrt.o:	ccbrt.c
101
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccbrt.c -o shared/ccbrt.o
102
-
103
-static/ccos.o:	ccos.c
104
-	${CC} ${CFLAGS} -fno-builtin -c ccos.c -o static/ccos.o
105
-
106
-shared/ccos.o:	ccos.c
107
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccos.c -o shared/ccos.o
108
-
109
-static/ccosh.o:	ccosh.c
110
-	${CC} ${CFLAGS} -fno-builtin -c ccosh.c -o static/ccosh.o
111
-
112
-shared/ccosh.o:	ccosh.c
113
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccosh.c -o shared/ccosh.o
114
-
115
-static/ccot.o:	ccot.c
116
-	${CC} ${CFLAGS} -fno-builtin -c ccot.c -o static/ccot.o
117
-
118
-shared/ccot.o:	ccot.c
119
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccot.c -o shared/ccot.o
120
-
121
-static/ccoth.o:	ccoth.c
122
-	${CC} ${CFLAGS} -fno-builtin -c ccoth.c -o static/ccoth.o
123
-
124
-shared/ccoth.o:	ccoth.c
125
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccoth.c -o shared/ccoth.o
126
-
127
-static/ccsc.o:	ccsc.c
128
-	${CC} ${CFLAGS} -fno-builtin -c ccsc.c -o static/ccsc.o
129
-
130
-shared/ccsc.o:	ccsc.c
131
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccsc.c -o shared/ccsc.o
132
-
133
-static/ccsch.o:	ccsch.c
134
-	${CC} ${CFLAGS} -fno-builtin -c ccsch.c -o static/ccsch.o
135
-
136
-shared/ccsch.o:	ccsch.c
137
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ccsch.c -o shared/ccsch.o
138
-
139
-static/cexp.o:	cexp.c
140
-	${CC} ${CFLAGS} -fno-builtin -c cexp.c -o static/cexp.o
141
-
142
-shared/cexp.o:	cexp.c
143
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cexp.c -o shared/cexp.o
144
-
145
-static/clog.o:	clog.c
146
-	${CC} ${CFLAGS} -fno-builtin -c clog.c -o static/clog.o
147
-
148
-shared/clog.o:	clog.c
149
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c clog.c -o shared/clog.o
150
-
151
-static/clog10.o:	clog10.c
152
-	${CC} ${CFLAGS} -fno-builtin -c clog10.c -o static/clog10.o
153
-
154
-shared/clog10.o:	clog10.c
155
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c clog10.c -o shared/clog10.o
156
-
157
-static/clogb.o:	clogb.c
158
-	${CC} ${CFLAGS} -fno-builtin -c clogb.c -o static/clogb.o
159
-
160
-shared/clogb.o:	clogb.c
161
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c clogb.c -o shared/clogb.o
162
-
163
-static/cpow.o:	cpow.c
164
-	${CC} ${CFLAGS} -fno-builtin -c cpow.c -o static/cpow.o
165
-
166
-shared/cpow.o:	cpow.c
167
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c cpow.c -o shared/cpow.o
168
-
169
-static/csec.o:	csec.c
170
-	${CC} ${CFLAGS} -fno-builtin -c csec.c -o static/csec.o
171
-
172
-shared/csec.o:	csec.c
173
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c csec.c -o shared/csec.o
174
-
175
-static/csech.o:	csech.c
176
-	${CC} ${CFLAGS} -fno-builtin -c csech.c -o static/csech.o
177
-
178
-shared/csech.o:	csech.c
179
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c csech.c -o shared/csech.o
180
-
181
-static/csgn.o:	csgn.c
182
-	${CC} ${CFLAGS} -fno-builtin -c csgn.c -o static/csgn.o
183
-
184
-shared/csgn.o:	csgn.c
185
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c csgn.c -o shared/csgn.o
186
-
187
-static/csin.o:	csin.c
188
-	${CC} ${CFLAGS} -fno-builtin -c csin.c -o static/csin.o
189
-
190
-shared/csin.o:	csin.c
191
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c csin.c -o shared/csin.o
192
-
193
-static/csinh.o:	csinh.c
194
-	${CC} ${CFLAGS} -fno-builtin -c csinh.c -o static/csinh.o
195
-
196
-shared/csinh.o:	csinh.c
197
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c csinh.c -o shared/csinh.o
198
-
199
-static/csqrt.o:	csqrt.c
200
-	${CC} ${CFLAGS} -fno-builtin -c csqrt.c -o static/csqrt.o
201
-
202
-shared/csqrt.o:	csqrt.c
203
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c csqrt.c -o shared/csqrt.o
204
-
205
-static/ctan.o:	ctan.c
206
-	${CC} ${CFLAGS} -fno-builtin -c ctan.c -o static/ctan.o
207
-
208
-shared/ctan.o:	ctan.c
209
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ctan.c -o shared/ctan.o
210
-
211
-static/ctanh.o:	ctanh.c
212
-	${CC} ${CFLAGS} -fno-builtin -c ctanh.c -o static/ctanh.o
213
-
214
-shared/ctanh.o:	ctanh.c
215
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c ctanh.c -o shared/ctanh.o
216
-
217
-static/prim.o:	prim.c
218
-	${CC} ${CFLAGS} -fno-builtin -c prim.c -o static/prim.o
219
-
220
-shared/prim.o:	prim.c
221
-	${CC} ${CFLAGS} -fPIC -fno-builtin -c prim.c -o shared/prim.o
222
-
223
-.PHONY: build
224
-build:
225
-	${MKDIR} static
226
-	${MKDIR} shared
227
-
228
-${solib}:	build  shared/cacos.o shared/cacosh.o shared/cacot.o shared/cacoth.o shared/cacsc.o shared/cacsch.o shared/casec.o shared/casech.o shared/casin.o shared/casinh.o shared/catan.o shared/catanh.o shared/ccbrt.o shared/ccos.o shared/ccosh.o shared/ccot.o shared/ccoth.o shared/ccsc.o shared/ccsch.o shared/cexp.o shared/clog.o shared/clog10.o shared/clogb.o shared/cpow.o shared/csec.o shared/csech.o shared/csgn.o shared/csin.o shared/csinh.o shared/csqrt.o shared/ctan.o shared/ctanh.o shared/prim.o
229
-	${CC} ${CFLAGS} -shared -s -fPIC -Wl,-soname,${solib}.1.7.0 -o ${solib}  shared/cacos.o shared/cacosh.o shared/cacot.o shared/cacoth.o shared/cacsc.o shared/cacsch.o shared/casec.o shared/casech.o shared/casin.o shared/casinh.o shared/catan.o shared/catanh.o shared/ccbrt.o shared/ccos.o shared/ccosh.o shared/ccot.o shared/ccoth.o shared/ccsc.o shared/ccsch.o shared/cexp.o shared/clog.o shared/clog10.o shared/clogb.o shared/cpow.o shared/csec.o shared/csech.o shared/csgn.o shared/csin.o shared/csinh.o shared/csqrt.o shared/ctan.o shared/ctanh.o shared/prim.o
230
-
231
-${alib}:	build  static/cacos.o static/cacosh.o static/cacot.o static/cacoth.o static/cacsc.o static/cacsch.o static/casec.o static/casech.o static/casin.o static/casinh.o static/catan.o static/catanh.o static/ccbrt.o static/ccos.o static/ccosh.o static/ccot.o static/ccoth.o static/ccsc.o static/ccsch.o static/cexp.o static/clog.o static/clog10.o static/clogb.o static/cpow.o static/csec.o static/csech.o static/csgn.o static/csin.o static/csinh.o static/csqrt.o static/ctan.o static/ctanh.o static/prim.o
232
-	${AR} rcs static/${alib}  static/cacos.o static/cacosh.o static/cacot.o static/cacoth.o static/cacsc.o static/cacsch.o static/casec.o static/casech.o static/casin.o static/casinh.o static/catan.o static/catanh.o static/ccbrt.o static/ccos.o static/ccosh.o static/ccot.o static/ccoth.o static/ccsc.o static/ccsch.o static/cexp.o static/clog.o static/clog10.o static/clogb.o static/cpow.o static/csec.o static/csech.o static/csgn.o static/csin.o static/csinh.o static/csqrt.o static/ctan.o static/ctanh.o static/prim.o
233
-	${RANLIB} static/${alib}
234
-
235
-.PHONY: install
236
-install:	${alib} ${solib}
237
-	${MKDIR} ${INSTDIR}
238
-	${MKDIR} ${INSTDIRPC}
239
-	${MKDIR} ${INSTDIRI}
240
-	${INSTALL} static/${alib} ${INSTDIR}/${alib}
241
-	${INSTALL} ${solib} ${INSTDIR}/${solib}
242
-	${INSTALL} ${pkgconfig} ${INSTDIRPC}/${pkgconfig}
243
-	${INSTALL} ${manpage} ${INSTDIRM}/${manpage}
244
-	${INSTALL} ../complex.h ${INSTDIRI}/amathi.h
245
-	${LDCONFIG} ${INSTDIR}
246
-
247
-.PHONY: uninstall
248
-uninstall:
249
-	${DEL} ${INSTDIR}/${alib}
250
-	${DEL} ${INSTDIR}/${solib}
251
-	${DEL} ${INSTDIRPC}/${pkgconfig}
252
-	${DEL} ${INSTDIRM}/${manpage}
253
-	${DEL} ${INSTDIRPC}/amathi.pc
254
-	${DEL} ${INSTDIRI}/amathi.h
255
-	${LDCONFIG}
256
-
257
-clean:
258
-	${DEL} static/${alib} ${solib}  static/cacos.o static/cacosh.o static/cacot.o static/cacoth.o static/cacsc.o static/cacsch.o static/casec.o static/casech.o static/casin.o static/casinh.o static/catan.o static/catanh.o static/ccbrt.o static/ccos.o static/ccosh.o static/ccot.o static/ccoth.o static/ccsc.o static/ccsch.o static/cexp.o static/clog.o static/clog10.o static/clogb.o static/cpow.o static/csec.o static/csech.o static/csgn.o static/csin.o static/csinh.o static/csqrt.o static/ctan.o static/ctanh.o static/prim.o  shared/cacos.o shared/cacosh.o shared/cacot.o shared/cacoth.o shared/cacsc.o shared/cacsch.o shared/casec.o shared/casech.o shared/casin.o shared/casinh.o shared/catan.o shared/catanh.o shared/ccbrt.o shared/ccos.o shared/ccosh.o shared/ccot.o shared/ccoth.o shared/ccsc.o shared/ccsch.o shared/cexp.o shared/clog.o shared/clog10.o shared/clogb.o shared/cpow.o shared/csec.o shared/csech.o shared/csgn.o shared/csin.o shared/csinh.o shared/csqrt.o shared/ctan.o shared/ctanh.o shared/prim.o
259
-

+ 1
- 1
src/cplex/amathi.3 View File

@@ -1,4 +1,4 @@
1
-.TH "amath/amathi.h" 3 "Wed Mar 1 2017" "Version 1.7.0" "amath" \" -*- nroff -*-
1
+.TH "amath/amathi.h" 3 "Wed Mar 1 2017" "Version 1.7.1" "amath" \" -*- nroff -*-
2 2
 .ad l
3 3
 .nh
4 4
 .SH NAME

+ 1
- 1
src/cplex/amathi.pc View File

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
5 5
 
6 6
 Name: amath complex library
7 7
 Description: Functions for handling complex numbers
8
-Version: 1.7.0
8
+Version: 1.7.1
9 9
 Cflags: -I${includedir}
10 10
 Libs: -L${libdir} -lamathi

+ 0
- 142
src/cplex/amathi.vcxproj View File

@@ -1,142 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup Label="ProjectConfigurations">
4
-    <ProjectConfiguration Include="Debug|Win32">
5
-      <Configuration>Debug</Configuration>
6
-      <Platform>Win32</Platform>
7
-    </ProjectConfiguration>
8
-    <ProjectConfiguration Include="Release|Win32">
9
-      <Configuration>Release</Configuration>
10
-      <Platform>Win32</Platform>
11
-    </ProjectConfiguration>
12
-    <ProjectConfiguration Include="Debug|x64">
13
-      <Configuration>Debug</Configuration>
14
-      <Platform>x64</Platform>
15
-    </ProjectConfiguration>
16
-    <ProjectConfiguration Include="Release|x64">
17
-      <Configuration>Release</Configuration>
18
-      <Platform>x64</Platform>
19
-    </ProjectConfiguration>
20
-  </ItemGroup>
21
-  <PropertyGroup Label="Globals">
22
-    <VCProjectVersion>15.0</VCProjectVersion>
23
-    <ProjectGuid>{278A3E34-C1F0-4176-AA98-6D8CD4F16438}</ProjectGuid>
24
-    <Keyword>Win32Proj</Keyword>
25
-  </PropertyGroup>
26
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28
-    <ConfigurationType>StaticLibrary</ConfigurationType>
29
-    <UseDebugLibraries>true</UseDebugLibraries>
30
-    <PlatformToolset>v141</PlatformToolset>
31
-  </PropertyGroup>
32
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
33
-    <ConfigurationType>StaticLibrary</ConfigurationType>
34
-    <UseDebugLibraries>false</UseDebugLibraries>
35
-    <PlatformToolset>v141</PlatformToolset>
36
-  </PropertyGroup>
37
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
38
-    <ConfigurationType>Application</ConfigurationType>
39
-    <UseDebugLibraries>true</UseDebugLibraries>
40
-    <PlatformToolset>v141</PlatformToolset>
41
-  </PropertyGroup>
42
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43
-    <ConfigurationType>Application</ConfigurationType>
44
-    <UseDebugLibraries>false</UseDebugLibraries>
45
-    <PlatformToolset>v141</PlatformToolset>
46
-  </PropertyGroup>
47
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48
-  <ImportGroup Label="ExtensionSettings">
49
-  </ImportGroup>
50
-  <ImportGroup Label="Shared">
51
-  </ImportGroup>
52
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
53
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54
-  </ImportGroup>
55
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
56
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57
-  </ImportGroup>
58
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
59
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60
-  </ImportGroup>
61
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
62
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
-  </ImportGroup>
64
-  <PropertyGroup Label="UserMacros" />
65
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66
-    <LinkIncremental>true</LinkIncremental>
67
-  </PropertyGroup>
68
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69
-    <LinkIncremental>true</LinkIncremental>
70
-  </PropertyGroup>
71
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
72
-    <ClCompile>
73
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
75
-      <WarningLevel>Level3</WarningLevel>
76
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
77
-      <Optimization>Disabled</Optimization>
78
-      <AdditionalIncludeDirectories>$(ProjectDir)..</AdditionalIncludeDirectories>
79
-    </ClCompile>
80
-    <Link>
81
-      <TargetMachine>MachineX86</TargetMachine>
82
-      <GenerateDebugInformation>true</GenerateDebugInformation>
83
-      <SubSystem>Windows</SubSystem>
84
-    </Link>
85
-  </ItemDefinitionGroup>
86
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87
-    <ClCompile>
88
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
90
-      <WarningLevel>Level3</WarningLevel>
91
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
92
-    </ClCompile>
93
-    <Link>
94
-      <TargetMachine>MachineX86</TargetMachine>
95
-      <GenerateDebugInformation>true</GenerateDebugInformation>
96
-      <SubSystem>Windows</SubSystem>
97
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
98
-      <OptimizeReferences>true</OptimizeReferences>
99
-    </Link>
100
-  </ItemDefinitionGroup>
101
-  <ItemGroup>
102
-    <ClCompile Include="cacos.c" />
103
-    <ClCompile Include="cacosh.c" />
104
-    <ClCompile Include="cacot.c" />
105
-    <ClCompile Include="cacoth.c" />
106
-    <ClCompile Include="cacsc.c" />
107
-    <ClCompile Include="cacsch.c" />
108
-    <ClCompile Include="casec.c" />
109
-    <ClCompile Include="casech.c" />
110
-    <ClCompile Include="casin.c" />
111
-    <ClCompile Include="casinh.c" />
112
-    <ClCompile Include="catan.c" />
113
-    <ClCompile Include="catanh.c" />
114
-    <ClCompile Include="ccbrt.c" />
115
-    <ClCompile Include="ccos.c" />
116
-    <ClCompile Include="ccosh.c" />
117
-    <ClCompile Include="ccot.c" />
118
-    <ClCompile Include="ccoth.c" />
119