rainlance
/
amath
mirror of https://gitlab.com/rnger/amath
1
0
Fork 0
Code Releases Wiki Activity

Cleaned up definitions

This commit is contained in:
llsth 2015-04-08 01:15:36 +02:00
parent c80e7c0101
commit d7f8c6cbd3
23 changed files with 59 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.vcxproj
View File

@ -187,7 +187,6 @@
<ClInclude Include="app\system\task_amiga.h" />
<ClInclude Include="app\system\task_stdc.h" />
<ClInclude Include="app\system\window_amiga.h" />
<ClInclude Include="lib\ansicon.h" />
<ClInclude Include="lib\clib.h" />
<ClInclude Include="lib\complex.h" />
<ClInclude Include="lib\cplex\prim.h" />
@ -199,7 +198,6 @@
<ClInclude Include="lib\mem.h" />
<ClInclude Include="lib\platform.h" />
<ClInclude Include="lib\real\prim.h" />
<ClInclude Include="lib\text.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{21BD69A9-7F52-48D9-9846-6943E90A87A9}</ProjectGuid>

6
Makefile.vcxproj.filters
View File

@ -560,9 +560,6 @@
<ClInclude Include="app\system\base\thread.h">
<Filter>app\system\io</Filter>
</ClInclude>
<ClInclude Include="lib\ansicon.h">
<Filter>lib</Filter>
</ClInclude>
<ClInclude Include="lib\clib.h">
<Filter>lib</Filter>
</ClInclude>
@ -584,9 +581,6 @@
<ClInclude Include="lib\platform.h">
<Filter>lib</Filter>
</ClInclude>
<ClInclude Include="lib\text.h">
<Filter>lib</Filter>
</ClInclude>
<ClInclude Include="lib\dconv\dmath.h">
<Filter>lib\dconv</Filter>
</ClInclude>

2
app/lib/aengine.cpp
View File

@ -25,8 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "lib/charbuf.h"
#include "lib/aengine.h"

1
app/lib/ntext.cpp
View File

@ -26,7 +26,6 @@
#include "clib.h"
#include "math.h"
#include "text.h"
#include "dprint.h"
#include "complex.h"
#include "lib/real.h"

2
app/localize/help.h
View File

@ -37,8 +37,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "localize/lex.h"
#define symzero Symbol(0)

16
app/localize/start.h
View File

@ -81,19 +81,6 @@
//#define TXTCPU EMPTYSTRING
#endif
/******************************************************************************/
#if defined(AROS)
# define TXTSYSNAME SPACE "AROS"
#endif
#if defined(MORPHOS)
# define TXTSYSNAME SPACE "MorphOS"
#endif
#if defined(AOS3) || defined(AOS4)
# define TXTSYSNAME SPACE "AmigaOS"
#endif
#ifndef TXTSYSNAME
# define TXTSYSNAME EMPTYSTRING
#endif
/******************************************************************************/
#ifdef WITHTEST
# define TXTTEST SPACE "TEST"
#else
@ -109,7 +96,6 @@
#define TXTTITLE "amath version 1.6.0"
#define TXTDOSVERSION "\0$VER: amath 1.60 (01-04-2015)"
#define TXTCOPYRIGHT "(c) 2015 Carsten Sonne Larsen"
#define TXTARCH TXTCPU TXTFPU TXTSYSNAME TXTTEST
#define TXTSTARTMSG TXTTITLE SPACE TXTARCH SPACE TXTCOPYRIGHT
#define TXTSTARTMSG TXTTITLE SPACE TXTCPU TXTFPU TXTTEST SPACE TXTCOPYRIGHT
/******************************************************************************/
#endif

3
app/localize/tags.h
View File

@ -27,8 +27,7 @@
#ifndef AMATH_TEXT_TAGS_H
#define AMATH_TEXT_TAGS_H
#include "text.h"
#include "ansicon.h"
#include "clib.h"
#include "localize/start.h"
static const texttag texttags[] = {

2
app/localize/text.h
View File

@ -37,8 +37,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#define INTROMSG Program->Language->GetText(0)
#define TXTLISTDIRHEADER Program->Language->GetText(1)

1
app/main/functions.cpp
View File

@ -25,7 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "lib/numb.h"
#include "main/values.h"
#include "main/functions.h"

2
app/main/nodes.cpp
View File

@ -25,8 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "lib/numb.h"
#include "lib/charbuf.h"
#include "main/nodes.h"

2
app/main/nodes.h
View File

@ -34,8 +34,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "lib/numb.h"
#include "lib/charbuf.h"

1
app/main/statements.cpp
View File

@ -26,7 +26,6 @@
#include "mem.h"
#include "clib.h"
#include "text.h"
#include "lib/real.h"
#include "lib/charbuf.h"
#include "localize/help.h"

2
app/system/base/io.cpp
View File

@ -26,8 +26,6 @@
#include "mem.h"
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "localize/start.h"
#include "system/program.h"
#include "system/program_stdc.h"

2
app/system/console.cpp
View File

@ -25,8 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "localize/text.h"
#include "system/console.h"
#include "system/base/io.h"

1
app/system/filesystem_amiga.cpp
View File

@ -25,7 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "lib/charbuf.h"
#include "localize/text.h"
#include "system/program.h"

1
app/system/filesystem_stdc.cpp
View File

@ -26,7 +26,6 @@
#include "clib.h"
#include "text.h"
#include "lib/charbuf.h"
#include "localize/text.h"
#include "system/program.h"

1
app/system/language.cpp
View File

@ -25,7 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "localize/tags.h"
#include "system/language.h"

2
app/system/preferences.cpp
View File

@ -25,8 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "lib/numb.h"
#include "lib/real.h"
#include "lib/ntext.h"

2
catalog/help.sd
View File

@ -39,8 +39,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#include "localize/lex.h"
#define symzero Symbol(0)

2
catalog/text.sd
View File

@ -39,8 +39,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
#define %i Program->Language->GetText(%d)

29
lib/clib.h
View File

@ -31,41 +31,26 @@
* @file clib.h
* @brief C functions for manipulating strings and memory.
*
* This file contains classless C functions. Similar functions can
* be found in standard C libraries.
*
*/
#include "text.h"
#include "platform.h"
/**
* @brief NULL pointer for non allocated memory.
*
* Use the NOMEM to avoid unnecessary dependency to stdio NULL.
*/
#define NOMEM 0
// Defintions used i CLib functions
#define LONG_BIT 32
#define wsize sizeof(unsigned int)
#define wmask (wsize - 1)
#ifndef __cplusplus
typedef int bool;
#define true 1
#define false 0
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
const char *tag;
const char *text;
} texttag;
int StrLen(const char *string);
bool StrIsEqual(const char *s1, const char *s2);
void MemSet(void *destination, int c0, unsigned int length);
void MemCopy(void *destination, const void *source, unsigned int length);
unsigned int AllocAndCopy(char **destination, const char *source);
void Untag(char *destination, const char *source,
texttag tags[], unsigned int tagcount);
#ifdef __cplusplus
}

2
lib/clib/untag.c
View File

@ -25,8 +25,6 @@
*/
#include "clib.h"
#include "text.h"
#include "ansicon.h"
void Untag(char *destination, const char *source, texttag tags[], unsigned int tagcount)
{

50
lib/platform.h
View File

@ -29,6 +29,20 @@
#include <stddef.h>
#define EMPTYSTRING ""
#define SPACE " "
#define NEWLINE "\n"
#define NOMEM 0
#define LONG_BIT 32
#define wsize sizeof(unsigned int)
#define wmask (wsize - 1)
#ifndef __cplusplus
typedef int bool;
#define true 1
#define false 0
#endif
#ifdef __AMIGA__
# ifndef AOS3
# define AOS3
@ -112,4 +126,40 @@ typedef u_int64_t uint64_t;
# define IPTR LONG*
#endif
#if defined(ANSICONSOLE)
#define HEADLINE "\x1B[1m"
#define SYNTAXHIGHLIGHT "\x1B[3m\x1B[32m"
#define NORMALTEXT "\x1B[0m"
#define BOLD "\x1B[1m"
#define ITALICS "\x1B[3m"
#define UNDERLINE "\x1B[4m"
#define COLOR01 "\x1B[31m"
#define COLOR02 "\x1B[32m"
#define COLOR03 "\x1B[33m"
#define CURSORFORWARD "\x1B[1C"
#define CURSORBACKWARD "\x1B[1D"
#define ERASEINLINE "\x1B[K"
#define INSERT1CHAR "\x1B[1@"
#define DELETE1CHAR "\x1B[1P"
#define DELETELINE "\x0D\x1B[K"
#define CLEARWINDOW "\x1B[1;1H\x1B[J"
#else
#define HEADLINE EMPTYSTRING
#define SYNTAXHIGHLIGHT EMPTYSTRING
#define NORMALTEXT EMPTYSTRING
#define BOLD EMPTYSTRING
#define ITALICS EMPTYSTRING
#define UNDERLINE EMPTYSTRING
#define COLOR01 EMPTYSTRING
#define COLOR02 EMPTYSTRING
#define COLOR03 EMPTYSTRING
#define CURSORFORWARD EMPTYSTRING
#define CURSORBACKWARD EMPTYSTRING
#define ERASEINLINE EMPTYSTRING
#define INSERT1CHAR EMPTYSTRING
#define DELETE1CHAR EMPTYSTRING
#define DELETELINE EMPTYSTRING
#define CLEARWINDOW EMPTYSTRING
#endif
#endif