hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recovered from cvs revision 2007-10-13 15:44:00

Browse Source
This commit is contained in:
hyung-hwan 2007-10-14 02:25:00 +00:00
parent c305a2dacb
commit 3847f21e2b
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ase/awk/Awk.cpp
View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.cpp,v 1.73 2007/10/13 05:08:28 bacon Exp $ * $Id: Awk.cpp,v 1.74 2007/10/13 06:28:17 bacon Exp $
* *
* {License} * {License}
*/ */
@ -195,7 +195,11 @@ void Awk::Argument::clear ()
{ {
if (this->val->type != ASE_AWK_VAL_STR) if (this->val->type != ASE_AWK_VAL_STR)
{ {
awk_t* awk = this->run->awk->awk, #if defined(__DMC__)
awk_t* awk = (awk_t*)*(this->run->awk);
#else
awk_t* awk = this->run->awk->awk;
#endif
ase_awk_free (awk, this->str.ptr); ase_awk_free (awk, this->str.ptr);
} }

4
ase/awk/Awk.hpp
View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.hpp,v 1.73 2007/10/10 13:22:12 bacon Exp $ * $Id: Awk.hpp,v 1.74 2007/10/13 06:28:17 bacon Exp $
* *
* {License} * {License}
*/ */
@ -302,7 +302,7 @@ public:
void* operator new (size_t n, awk_t* awk) throw (); void* operator new (size_t n, awk_t* awk) throw ();
void* operator new[] (size_t n, awk_t* awk) throw (); void* operator new[] (size_t n, awk_t* awk) throw ();
#if !defined(__BORLANDC__) #if !defined(__BORLANDC__)
// deletion when initialization fails // deletion when initialization fails
void operator delete (void* p, awk_t* awk); void operator delete (void* p, awk_t* awk);
void operator delete[] (void* p, awk_t* awk); void operator delete[] (void* p, awk_t* awk);

12
ase/awk/dmc-msw.mak
View File

@ -11,9 +11,9 @@ LD = link
AR = lib AR = lib
JAVAC = javac JAVAC = javac
CFLAGS = -mn -I../.. $(JNI_INC) CFLAGS = -mn -I..\.. $(JNI_INC)
CXXFLAGS = -cpp -mn -I../.. $(JNI_INC) CXXFLAGS = -Aa -Ab -Ae -mn -I..\.. $(JNI_INC)
JAVACFLAGS = -classpath ../.. -Xlint:unchecked JAVACFLAGS = -classpath ..\.. -Xlint:unchecked
MODE=debug MODE=debug
@ -24,7 +24,7 @@ OUT_FILE_LIB_CXX = $(OUT_DIR)\$(NAME)pp.lib
OUT_FILE_JAR = $(OUT_DIR)/$(NAME).jar OUT_FILE_JAR = $(OUT_DIR)/$(NAME).jar
TMP_DIR = $(MODE) TMP_DIR = $(MODE)
TMP_DIR_CXX = $(TMP_DIR)/cxx TMP_DIR_CXX = $(TMP_DIR)\cxx
OBJ_FILES_LIB = \ OBJ_FILES_LIB = \
$(TMP_DIR)\awk.obj \ $(TMP_DIR)\awk.obj \
@ -59,7 +59,7 @@ OBJ_FILES_JAR = \
lib: build$(JNI) lib: build$(JNI)
build: $(OUT_FILE_LIB) build: $(OUT_FILE_LIB) $(OUT_FILE_LIB_CXX)
buildjni: build $(OUT_FILE_JNI) buildjni: build $(OUT_FILE_JNI)
@ -148,7 +148,7 @@ $(TMP_DIR):
md $(TMP_DIR) md $(TMP_DIR)
$(TMP_DIR_CXX): $(TMP_DIR) $(TMP_DIR_CXX): $(TMP_DIR)
md $(TMP_DIR)/cxx md $(TMP_DIR_CXX)
clean: clean:
rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OUT_FILE_LIB_CXX) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OBJ_FILES_LIB_CXX) rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OUT_FILE_LIB_CXX) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OBJ_FILES_LIB_CXX)

4
ase/awk/makefile.in
View File

@ -1,5 +1,5 @@
# #
# $Id: makefile.in,v 1.8 2007/10/13 05:08:28 bacon Exp $ # $Id: makefile.in,v 1.9 2007/10/13 06:28:17 bacon Exp $
# #
NAME = aseawk NAME = aseawk
@ -164,7 +164,7 @@ $(TMP_DIR):
mkdir -p $(TMP_DIR) mkdir -p $(TMP_DIR)
$(TMP_DIR_CXX): $(TMP_DIR) $(TMP_DIR_CXX): $(TMP_DIR)
mkdir -p $(TMP_DIR)/cxx mkdir -p $(TMP_DIR_CXX)
clean: clean:
rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OUT_FILE_LIB_CXX) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OBJ_FILES_LIB_CXX) rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OUT_FILE_LIB_CXX) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OBJ_FILES_LIB_CXX)

4
ase/cmn/conf_msw.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: conf_msw.h,v 1.3 2007/04/30 05:55:36 bacon Exp $ * $Id: conf_msw.h,v 1.4 2007/10/13 06:28:17 bacon Exp $
* *
* {License} * {License}
*/ */
@ -31,7 +31,7 @@ _M_X64 x64 platform
#define ASE_SIZEOF_LONG 4 #define ASE_SIZEOF_LONG 4
/*#endif*/ /*#endif*/
#ifdef __POCC__ #if defined(__POCC__) || defined(__DMC__)
/* pelles c with no microsoft extension */ /* pelles c with no microsoft extension */
#define ASE_SIZEOF_LONG_LONG 8 #define ASE_SIZEOF_LONG_LONG 8