Skip to content

Commit f91e645

Browse files
committed
Unsupported ICU interface
1 parent 7386a38 commit f91e645

File tree

6 files changed

+16
-3
lines changed

6 files changed

+16
-3
lines changed

generic/tclBasic.c

+4
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,10 @@ Tcl_CreateInterp(void)
12011201
Tcl_CreateObjCommand(interp, "::tcl::unsupported::corotype",
12021202
CoroTypeObjCmd, NULL, NULL);
12031203

1204+
/* Load and intialize ICU */
1205+
Tcl_CreateObjCommand(interp, "::tcl::unsupported::loadIcu",
1206+
TclLoadIcuObjCmd, NULL, NULL);
1207+
12041208
/* Export unsupported commands */
12051209
nsPtr = Tcl_FindNamespace(interp, "::tcl::unsupported", NULL, 0);
12061210
if (nsPtr) {

generic/tclInt.h

+1
Original file line numberDiff line numberDiff line change
@@ -3719,6 +3719,7 @@ MODULE_SCOPE int TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
37193719
MODULE_SCOPE Tcl_Obj * TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
37203720
Tcl_Size pathc, Tcl_Obj *const pathv[]);
37213721
MODULE_SCOPE Tcl_ObjCmdProc Tcl_DisassembleObjCmd;
3722+
MODULE_SCOPE Tcl_ObjCmdProc TclLoadIcuObjCmd;
37223723

37233724
/* Assemble command function */
37243725
MODULE_SCOPE Tcl_ObjCmdProc Tcl_AssembleObjCmd;

library/tclIndex

+1
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,4 @@ set auto_index(tcl_endOfWord) [list ::tcl::Pkg::source [file join $dir word.tcl]
109109
set auto_index(tcl_startOfNextWord) [list ::tcl::Pkg::source [file join $dir word.tcl]]
110110
set auto_index(tcl_startOfPreviousWord) [list ::tcl::Pkg::source [file join $dir word.tcl]]
111111
set auto_index(writeFile) [list ::tcl::Pkg::source [file join $dir writefile.tcl]]
112+
set auto_index(::tcl::unsupported::icu) [list ::tcl::Pkg::source [file join $dir icu.tcl]]

unix/Makefile.in

+7-2
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
306306
tclCompile.o tclConfig.o tclDate.o tclDictObj.o tclDisassemble.o \
307307
tclEncoding.o tclEnsemble.o \
308308
tclEnv.o tclEvent.o tclExecute.o tclFCmd.o tclFileName.o tclGet.o \
309-
tclHash.o tclHistory.o tclIndexObj.o tclInterp.o tclIO.o tclIOCmd.o \
309+
tclHash.o tclHistory.o \
310+
tclIcu.o tclIndexObj.o tclInterp.o tclIO.o tclIOCmd.o \
310311
tclIORChan.o tclIORTrans.o tclIOGT.o tclIOSock.o tclIOUtil.o \
311312
tclLink.o tclListObj.o \
312313
tclLiteral.o tclLoad.o tclMain.o tclNamesp.o tclNotify.o \
@@ -434,6 +435,7 @@ GENERIC_SRCS = \
434435
$(GENERIC_DIR)/tclGet.c \
435436
$(GENERIC_DIR)/tclHash.c \
436437
$(GENERIC_DIR)/tclHistory.c \
438+
$(GENERIC_DIR)/tclIcu.c \
437439
$(GENERIC_DIR)/tclIndexObj.c \
438440
$(GENERIC_DIR)/tclInterp.c \
439441
$(GENERIC_DIR)/tclIO.c \
@@ -1101,7 +1103,7 @@ install-libraries: libraries
11011103
@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ] ; then \
11021104
echo "Customizing tcl module path"; \
11031105
echo "if {![interp issafe]} { ::tcl::tm::roots [list $(TCL_MODULE_PATH)] }" >> \
1104-
"$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
1106+
"$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
11051107
fi
11061108

11071109
install-tzdata:
@@ -1377,6 +1379,9 @@ tclHash.o: $(GENERIC_DIR)/tclHash.c
13771379
tclHistory.o: $(GENERIC_DIR)/tclHistory.c
13781380
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclHistory.c
13791381

1382+
tclIcu.o: $(GENERIC_DIR)/tclIcu.c
1383+
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIcu.c
1384+
13801385
tclIndexObj.o: $(GENERIC_DIR)/tclIndexObj.c
13811386
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIndexObj.c
13821387

win/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ GENERIC_OBJS = \
316316
tclGet.$(OBJEXT) \
317317
tclHash.$(OBJEXT) \
318318
tclHistory.$(OBJEXT) \
319+
tclIcu.$(OBJEXT) \
319320
tclIndexObj.$(OBJEXT) \
320321
tclInterp.$(OBJEXT) \
321322
tclIO.$(OBJEXT) \
@@ -617,7 +618,7 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
617618
${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT}
618619
@$(RM) ${TEST_EXE_FILE}
619620
$(CC) $(CFLAGS) $(TCLTEST_OBJS) tclTestMain.$(OBJEXT) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
620-
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
621+
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
621622
$(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest
622623

623624
# use prebuilt zlib1.dll

win/makefile.vc

+1
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ COREOBJS = \
277277
$(TMP_DIR)\tclGet.obj \
278278
$(TMP_DIR)\tclHash.obj \
279279
$(TMP_DIR)\tclHistory.obj \
280+
$(TMP_DIR)\tclIcu.obj \
280281
$(TMP_DIR)\tclIndexObj.obj \
281282
$(TMP_DIR)\tclInterp.obj \
282283
$(TMP_DIR)\tclIO.obj \

0 commit comments

Comments
 (0)