mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-19 01:31:17 -10:00
Compare commits
69
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24906dde22 | ||
|
|
bf9916e270 | ||
|
|
c6747a0d3f | ||
|
|
17a0cd07df | ||
|
|
d23c285914 | ||
|
|
c94c32d25f | ||
|
|
d14f7229de | ||
|
|
358364e296 | ||
|
|
3c3298c935 | ||
|
|
a8169657e5 | ||
|
|
2abcd8c550 | ||
|
|
0d8ab85503 | ||
|
|
cab3731f55 | ||
|
|
8ec3155df9 | ||
|
|
cbf8c48dd3 | ||
|
|
b1ecc84c40 | ||
|
|
397b7ac493 | ||
|
|
050260877b | ||
|
|
671301931a | ||
|
|
ee40dbd92b | ||
|
|
91edcf60a5 | ||
|
|
7202caa9d9 | ||
|
|
e5c93bb691 | ||
|
|
57accaa58c | ||
|
|
5ca532241d | ||
|
|
5295717ed2 | ||
|
|
e8c324e6a2 | ||
|
|
a0746ae6c5 | ||
|
|
8a5afbae36 | ||
|
|
bcffcd5b81 | ||
|
|
eabeb7d2e2 | ||
|
|
451614ec61 | ||
|
|
172ee433de | ||
|
|
4769716742 | ||
|
|
60e5bcc42d | ||
|
|
0fe9c3f5e7 | ||
|
|
ee2bdff675 | ||
|
|
ac504cc3db | ||
|
|
0d6bd08a90 | ||
|
|
e76f20efbb | ||
|
|
b8fbf2ec20 | ||
|
|
e8d49a8870 | ||
|
|
6635c94936 | ||
|
|
0e6e9da90b | ||
|
|
cf532c2e60 | ||
|
|
9a5238504a | ||
|
|
a0f9928e49 | ||
|
|
b64ac133b7 | ||
|
|
3534344b61 | ||
|
|
7ff7a966fb | ||
|
|
51436c31ee | ||
|
|
0c158dc33c | ||
|
|
b1bf3e9ff1 | ||
|
|
52a04a859c | ||
|
|
6f594e13f3 | ||
|
|
81a1f566ea | ||
|
|
0717dd85e9 | ||
|
|
d6da946bec | ||
|
|
931932d774 | ||
|
|
8a77f84436 | ||
|
|
e73d556bf7 | ||
|
|
e606120a95 | ||
|
|
eeec6e8904 | ||
|
|
628c8cbae0 | ||
|
|
e6ca6781e1 | ||
|
|
852bcf8213 | ||
|
|
0738b1b7fa | ||
|
|
c0c70fc306 | ||
|
|
cef2791818 |
No files matched your search
@@ -1,22 +1,3 @@
|
||||
2006-01-13 Raja R Harinath <[email protected]>
|
||||
|
||||
* data/net_2_0/machine.config: Fix a couple of typos in type names.
|
||||
|
||||
2006-01-10 Raja R Harinath <[email protected]>
|
||||
|
||||
* scripts/Makefile.am (scripts_2_0): Add nunit-console2.
|
||||
|
||||
2006-01-09 Chris Toshok <[email protected]>
|
||||
|
||||
* data/net_2_0/machine.config: switch over to the 2.0
|
||||
configuration sections for System.Web and System.Web.Services.
|
||||
Also, add the configProtectedData stuff so we can encrypt config
|
||||
sections.
|
||||
|
||||
2006-01-08 Robert Jordan <[email protected]>
|
||||
|
||||
* man/mkbundle.1: Documented environment variables and Windows issues.
|
||||
|
||||
2006-01-06 Jonathan Pryor <[email protected]>
|
||||
|
||||
* data/config.in: s/libintl/intl/g. Mono.Unix.Catalog DllImports "intl"
|
||||
|
||||
@@ -25,11 +25,6 @@ This is Mono.
|
||||
|
||||
http://www.hpl.hp.com/research/linux/libunwind/download.php4
|
||||
|
||||
On Solaris, make sure that you used GNU tar to unpack this package, as
|
||||
Solaris tar will not unpack this correctly, and you will get strange errors.
|
||||
|
||||
On Solaris, make sure that you use the GNU toolchain to build the software.
|
||||
|
||||
Optional dependencies:
|
||||
|
||||
* libgdiplus
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
|
||||
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_INIT_AUTOMAKE(mono,1.1.13)
|
||||
AM_INIT_AUTOMAKE(mono,1.1.13.2)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PROG_LN_S
|
||||
|
||||
@@ -87,7 +87,6 @@
|
||||
<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.Config" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
|
||||
<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
|
||||
|
||||
+36
-37
@@ -3,35 +3,41 @@
|
||||
<configuration>
|
||||
|
||||
<configSections>
|
||||
<section name="configProtectedData" type="System.Configuration.ProtectedConfigurationSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="appSettings" type="System.Configuration.AppSettingsSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="connectionStrings" type="System.Configuration.ConnectionStringsSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="appSettings" type="System.Configuration.NameValueFileSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<section name="strongNames" type="System.Configuration.IgnoreSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="authorization" type="System.Web.Configuration.AuthorizationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="clientTarget" type="System.Web.Configuration.ClientTargetSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="compilation" type="System.Web.Configuration.CompilationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="customErrors" type="System.Web.Configuration.CustomErrorsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="globalization" type="System.Web.Configuration.GlobalizationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="httpHandlers" type="System.Web.Configuration.HttpHandlersSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="httpModules" type="System.Web.Configuration.HttpModulesSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="httpRuntime" type="System.Web.Configuration.HttpRuntimeSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="machineKey" type="System.Web.Configuration.MachineKeySection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="pages" type="System.Web.Configuration.PagesSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="profile" type="System.Web.Configuration.ProfileSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="sessionState" type="System.Web.Configuration.SessionStateSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="trace" type="System.Web.Configuration.TraceSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="webControls" type="System.Web.Configuration.WebControlsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="webServices" type="System.Web.Services.Configuration.WebServicesSection, System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<sectionGroup name="caching" type="System.Web.Configuration.SystemWebCachingSectionGroup, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<section name="cache" type="System.Web.Configuration.CacheSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="outputCache" type="System.Web.Configuration.OutputCacheSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="outputCacheSettings" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="sqlCacheDependency" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
</sectionGroup>
|
||||
<sectionGroup name="system.web">
|
||||
<section name="httpHandlers"
|
||||
type="System.Web.Configuration.HttpHandlersSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="httpModules"
|
||||
type="System.Web.Configuration.HttpModulesConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="machineKey"
|
||||
type="System.Web.Configuration.MachineKeyConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="authentication"
|
||||
type="System.Web.Configuration.AuthenticationConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="authorization"
|
||||
type="System.Web.Configuration.AuthorizationConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="globalization"
|
||||
type="System.Web.Configuration.GlobalizationConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="sessionState"
|
||||
type="System.Web.SessionState.SessionStateSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="trace"
|
||||
type="System.Web.Configuration.TraceConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="webServices"
|
||||
type="System.Web.Services.Configuration.WebServicesConfigurationSectionHandler, System.Web.Services, Version=2.0.0.0 Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="webControls"
|
||||
type="System.Web.Configuration.WebControlsSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="compilation"
|
||||
type="System.Web.Configuration.CompilationConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="httpRuntime"
|
||||
type="System.Web.Configuration.HttpRuntimeConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="customErrors"
|
||||
type="System.Web.Configuration.CustomErrorsConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="pages"
|
||||
type="System.Web.Configuration.PagesConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral" />
|
||||
<section name="clientTarget"
|
||||
type="System.Web.Configuration.ClientTargetSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral" />
|
||||
</sectionGroup>
|
||||
<sectionGroup name="system.net">
|
||||
<section name="settings"
|
||||
@@ -47,16 +53,6 @@
|
||||
</sectionGroup>
|
||||
<section name="system.drawing" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</configSections>
|
||||
|
||||
<configProtectedData defaultProvider="RsaProtectedConfigurationProvider">
|
||||
<providers>
|
||||
<add name="RsaProtectedConfigurationProvider" type="System.Configuration.RsaProtectedConfigurationProvider, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
description="" keyContainerName="MonoFrameworkConfigurationKey" cspProviderName="" useMachineContainer="true" useOAEP="false" />
|
||||
<add name="DataProtectionConfigurationProvider" type="System.Configuration.DpapiProtectedConfigurationProvider, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
description="" useMachineProtection="true" keyEntropy="" />
|
||||
</providers>
|
||||
</configProtectedData>
|
||||
|
||||
<system.net>
|
||||
<connectionManagement>
|
||||
<add address="*" maxconnection="2" />
|
||||
@@ -92,7 +88,6 @@
|
||||
<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.Config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
|
||||
<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
|
||||
@@ -156,6 +151,10 @@
|
||||
minFreeThreads="8"
|
||||
minLocalRequestFreeThreads="4"
|
||||
appRequestQueueLimit="100" />
|
||||
<pages buffer="true"
|
||||
enableSessionState="true"
|
||||
autoEventWireup="true"
|
||||
validateRequest="true" />
|
||||
<clientTarget>
|
||||
<add alias="ie5" userAgent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)" />
|
||||
<add alias="ie4" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2006-01-11 Zoltan Varga <[email protected]>
|
||||
|
||||
* include/private/gcconfig.h: Undef _FILE_OFFSET_BITS on sparc.
|
||||
|
||||
2006-01-03 Geoff Norton <[email protected]>
|
||||
|
||||
* darwin_stop_world.c: Merge a patch from Bruce Mitchener that fixes a small
|
||||
|
||||
@@ -834,10 +834,6 @@
|
||||
# define CPP_WORDSZ 32
|
||||
# endif
|
||||
# define ALIGN_DOUBLE
|
||||
# ifdef _FILE_OFFSET_BITS
|
||||
# undef _FILE_OFFSET_BITS /* libelf.h & procfs.h doesn't compile with large file support */
|
||||
# define _FILE_OFFSET_BITS 32
|
||||
# endif
|
||||
# ifdef SUNOS5
|
||||
# define OS_TYPE "SUNOS5"
|
||||
extern int _etext[];
|
||||
|
||||
@@ -87,22 +87,9 @@ When passed, DIR will be set for the MONO_CFG_DIR environment variable
|
||||
Compresses the assemblies before embedding. This results in smaller
|
||||
executable files, but increases startup time and requires zlib to be
|
||||
installed on the target system.
|
||||
.SH ENVIRONMENT VARIABLES
|
||||
.TP
|
||||
.I "AS"
|
||||
Assembler command. The default is "as".
|
||||
.TP
|
||||
.I "CC"
|
||||
C compiler command. The default is "cc" under Linux and "gcc -mno-cygwin"
|
||||
under Windows.
|
||||
.SH FILES
|
||||
This program will load referenced assemblies from the Mono assembly
|
||||
cache.
|
||||
.SH BUGS
|
||||
The options "--static" and "-z" are not supported under Windows.
|
||||
Moreover, a full cygwin environment containing at least "gcc" and "as"
|
||||
is required for the build process. The generated executable does not
|
||||
depend on cygwin.
|
||||
.SH MAILING LISTS
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-devel-list for details.
|
||||
.SH WEB SITE
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
2006-01-19 Raja R Harinath <[email protected]>
|
||||
|
||||
* library.make (test_lib): Don't allow to be overridden.
|
||||
(test_against, test_dep): Remove.
|
||||
|
||||
2006-01-11 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* executable.make: allow installing a different .config file for
|
||||
executables such as nunit-console.exe that should use a different one
|
||||
depending on the profile.
|
||||
|
||||
2006-01-05 Raja R Harinath <[email protected]>
|
||||
|
||||
* library.make (run-test-lib, run-test-ondotnet-lib): Workaround a
|
||||
|
||||
@@ -4,10 +4,7 @@
|
||||
|
||||
base_prog = $(shell basename $(PROGRAM))
|
||||
sourcefile = $(base_prog).sources
|
||||
base_prog_config := $(wildcard $(base_prog).config.$(PROFILE))
|
||||
ifndef base_prog_config
|
||||
base_prog_config := $(wildcard $(base_prog).config)
|
||||
endif
|
||||
ifdef base_prog_config
|
||||
PROGRAM_config := $(PROGRAM).config
|
||||
endif
|
||||
|
||||
+17
-4
@@ -63,20 +63,33 @@ test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%)
|
||||
test_nunit_ref = $(test_nunit_dep:%=-r:%)
|
||||
library_CLEAN_FILES += TestResult*.xml
|
||||
|
||||
ifndef test_against
|
||||
test_against = $(the_lib)
|
||||
test_dep = $(the_lib)
|
||||
endif
|
||||
|
||||
ifndef test_lib
|
||||
test_lib = $(LIBRARY:.dll=_test_$(PROFILE).dll)
|
||||
test_sourcefile = $(LIBRARY:.dll=_test.dll.sources)
|
||||
else
|
||||
test_sourcefile = $(test_lib).sources
|
||||
endif
|
||||
test_pdb = $(test_lib:.dll=.pdb)
|
||||
test_response = $(depsdir)/$(test_lib).response
|
||||
test_makefrag = $(depsdir)/$(test_lib).makefrag
|
||||
test_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MCS_FLAGS)
|
||||
test_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
|
||||
library_CLEAN_FILES += $(LIBRARY:.dll=_test*.dll) $(LIBRARY:.dll=_test*.pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
ifndef btest_lib
|
||||
btest_lib = $(LIBRARY:.dll=_btest_$(PROFILE).dll)
|
||||
btest_sourcefile = $(LIBRARY:.dll=_btest.dll.sources)
|
||||
else
|
||||
btest_sourcefile = $(btest_lib).sources
|
||||
endif
|
||||
btest_pdb = $(btest_lib:.dll=.pdb)
|
||||
btest_response = $(depsdir)/$(btest_lib).response
|
||||
btest_makefrag = $(depsdir)/$(btest_lib).makefrag
|
||||
btest_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
|
||||
btest_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
|
||||
library_CLEAN_FILES += $(LIBRARY:.dll=_btest*.dll) $(LIBRARY:.dll=_btest*.pdb) $(btest_response) $(btest_makefrag)
|
||||
|
||||
ifndef HAVE_CS_TESTS
|
||||
@@ -306,7 +319,7 @@ endif
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
|
||||
$(test_lib): $(the_lib) $(test_response) $(test_nunit_dep)
|
||||
$(test_lib): $(test_dep) $(test_response) $(test_nunit_dep)
|
||||
$(TEST_COMPILE) -target:library -out:$@ $(test_flags) @$(test_response)
|
||||
|
||||
$(test_response): $(test_sourcefile)
|
||||
@@ -323,7 +336,7 @@ endif
|
||||
|
||||
ifdef HAVE_VB_TESTS
|
||||
|
||||
$(btest_lib): $(the_lib) $(btest_response) $(test_nunit_dep)
|
||||
$(btest_lib): $(test_dep) $(btest_response) $(test_nunit_dep)
|
||||
$(BTEST_COMPILE) -target:library -out:$@ $(btest_flags) @$(btest_response)
|
||||
|
||||
$(btest_response): $(btest_sourcefile)
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2006-01-18 Chris Toshok <[email protected]>
|
||||
|
||||
* Makefile (common_dirs): add System.Web again after
|
||||
System.Web.Services.
|
||||
|
||||
2006-01-05 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile: Build FirebirdSql.Data.Firebird only in the "default"
|
||||
|
||||
@@ -1,43 +1,6 @@
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpObjects.cs : fixed warnings.
|
||||
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs : RdpOneOrMore.EmptyTextDeriv() should be "override".
|
||||
RdpList.EmptyTextDeriv() (which was also virtual incorrectly) was
|
||||
removed since the code was in wrong assumption.
|
||||
* Util.cs : debug string now contains data and dataExcept info.
|
||||
|
||||
2006-01-15 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs : lazy evaluate Group branches. If left hand is
|
||||
notAllowed, the returned value is always NotAllowed, no need to
|
||||
compute another branch.
|
||||
|
||||
2006-01-13 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpObjects.cs, RdpPatterns.cs : introduced "IsContextDependent"
|
||||
optimization; when a pattern is (namespace) context independent
|
||||
(almost all cases except for QName validation), new TextDeriv()
|
||||
overload that takes MemoizationStore memoizes TextDeriv results.
|
||||
|
||||
2006-01-12 Atsushi Enomoto <[email protected]>
|
||||
2005-01-05 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPattern.cs :
|
||||
Introduced EmptyTextDeriv() so that the results could be memoized.
|
||||
|
||||
2006-01-10 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs :
|
||||
- Added StartAttDeriv(), EndAttDeriv() and IsTextValueDependent.
|
||||
(See corresponding changes in RelaxngValidatingReader.cs).
|
||||
- Added a bunch of derivative method overloads to receive
|
||||
MemoizationStore and memoize results efficiently.
|
||||
|
||||
2006-01-05 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs :
|
||||
- Fixed RdpPattern.TextDeriv() and MixedTextDeriv() to not allow
|
||||
whitespaces incorrectly.
|
||||
- Fixed MixedTextDeriv() to not require string argument.
|
||||
@@ -52,7 +15,7 @@
|
||||
derivative algorithm (it incorrectly extended to return false
|
||||
for RELAX NG predefined datatypes).
|
||||
|
||||
2006-01-04 Atsushi Enomoto <[email protected]>
|
||||
2005-01-04 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPattern.cs :
|
||||
- Implemented textOnlyDeriv and mixedTextDeriv of "memoization".
|
||||
@@ -65,12 +28,12 @@
|
||||
- Avoid extra pattern creation with related to empty and notAllowed
|
||||
as one hand of binary branches.
|
||||
|
||||
2006-01-03 Atsushi Enomoto <[email protected]>
|
||||
2005-01-03 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPattern.cs : reduced RdpFlip instantiation. Share patternPool
|
||||
only when it does not exist.
|
||||
|
||||
2006-01-03 Atsushi Enomoto <[email protected]>
|
||||
2005-01-03 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Util.cs, RdpPatterns.cs : optimization. Removed extraneous
|
||||
delegate instantiation. Avoid using enum for HashTable keys.
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
|
||||
public class RdpDatatype
|
||||
{
|
||||
//RelaxngDatatypeProvider provider;
|
||||
RelaxngDatatypeProvider provider;
|
||||
string localName;
|
||||
string ns;
|
||||
RelaxngDatatype datatype;
|
||||
@@ -78,7 +78,7 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
{
|
||||
this.ns = ns;
|
||||
this.localName = localName;
|
||||
//this.provider = provider;
|
||||
this.provider = provider;
|
||||
if (provider == null)
|
||||
provider = RelaxngMergedProvider.DefaultProvider;
|
||||
datatype = provider.GetDatatype (localName, ns, parameters);
|
||||
@@ -95,15 +95,13 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return localName; }
|
||||
}
|
||||
|
||||
public bool IsContextDependent {
|
||||
get { return datatype.IsContextDependent; }
|
||||
}
|
||||
|
||||
public virtual bool IsAllowed (string value, XmlReader reader)
|
||||
{
|
||||
return datatype.IsValid (value, reader);
|
||||
}
|
||||
|
||||
static char [] wsChars = new char [] {' ', '\n', '\r', '\t'};
|
||||
|
||||
public virtual bool IsTypeEqual (string s1, string s2, XmlReader reader)
|
||||
{
|
||||
return datatype.CompareString (s1, s2, reader);
|
||||
|
||||
@@ -290,14 +290,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
|
||||
public abstract bool Nullable { get; }
|
||||
|
||||
internal virtual bool IsTextValueDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal virtual bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
// fills QName collection
|
||||
public void GetLabels (LabelList elements, LabelList attributes)
|
||||
{
|
||||
@@ -330,36 +322,16 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
|
||||
{
|
||||
return TextDeriv (s, reader);
|
||||
}
|
||||
|
||||
internal virtual RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return TextDeriv (String.Empty, null, memo);
|
||||
}
|
||||
|
||||
internal virtual RdpPattern TextOnlyDeriv ()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern TextOnlyDeriv (MemoizationStore store)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern MixedTextDeriv ()
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
public RdpPattern ListDeriv (string [] list, int index, XmlReader reader)
|
||||
{
|
||||
return listDerivInternal (list, 0, reader);
|
||||
@@ -435,11 +407,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
return StartTagOpenDeriv (name, ns);
|
||||
}
|
||||
|
||||
// attDeriv(ctx, this, att)
|
||||
// attDeriv _ _ _ = NotAllowed
|
||||
public virtual RdpPattern AttDeriv (string name, string ns, string value, XmlReader reader)
|
||||
@@ -447,26 +414,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
public virtual RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
return StartAttDeriv (name, ns);
|
||||
}
|
||||
|
||||
public virtual RdpPattern EndAttDeriv ()
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern EndAttDeriv (MemoizationStore memo)
|
||||
{
|
||||
return EndAttDeriv ();
|
||||
}
|
||||
|
||||
public bool ValueMatch (string s, XmlReader reader)
|
||||
{
|
||||
return Nullable && Util.IsWhitespace (s) ||
|
||||
@@ -478,11 +425,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return this;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
return StartTagCloseDeriv ();
|
||||
}
|
||||
|
||||
public RdpPattern OneOrMore ()
|
||||
{
|
||||
if (PatternType == RelaxngPatternType.NotAllowed)
|
||||
@@ -495,11 +437,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal virtual RdpPattern EndTagDeriv (MemoizationStore memo)
|
||||
{
|
||||
return EndTagDeriv ();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
@@ -516,14 +453,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
static RdpEmpty instance;
|
||||
public static RdpEmpty Instance {
|
||||
get { return instance; }
|
||||
@@ -577,14 +506,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
public override RdpPattern ApplyAfter (RdpApplyAfterHandler h)
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
@@ -637,14 +558,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Text; }
|
||||
}
|
||||
@@ -658,21 +571,11 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return this;
|
||||
}
|
||||
|
||||
internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv ()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
internal override void MarkReachableDefs ()
|
||||
{
|
||||
// do nothing
|
||||
@@ -809,32 +712,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
}
|
||||
}
|
||||
|
||||
bool isTextValueDependentComputed;
|
||||
bool isTextValueDependent;
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get {
|
||||
if (!isTextValueDependentComputed) {
|
||||
isTextValueDependent = LValue.IsTextValueDependent || RValue.IsTextValueDependent;
|
||||
isTextValueDependentComputed = true;
|
||||
}
|
||||
return isTextValueDependent;
|
||||
}
|
||||
}
|
||||
|
||||
bool isContextDependentComputed;
|
||||
bool isContextDependent;
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get {
|
||||
if (!isContextDependentComputed) {
|
||||
isContextDependent = LValue.IsContextDependent || RValue.IsContextDependent;
|
||||
isContextDependentComputed = true;
|
||||
}
|
||||
return isContextDependent;
|
||||
}
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Choice; }
|
||||
}
|
||||
@@ -897,41 +774,18 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return LValue.TextDeriv (s, reader).Choice (RValue.TextDeriv (s, reader));
|
||||
}
|
||||
|
||||
internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
|
||||
{
|
||||
return memo.TextDeriv (LValue, s, reader).Choice (memo.TextDeriv (RValue, s, reader));
|
||||
}
|
||||
|
||||
internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.EmptyTextDeriv (LValue)
|
||||
.Choice (memo.EmptyTextDeriv (RValue));
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv ()
|
||||
{
|
||||
return LValue.TextOnlyDeriv ().Choice (
|
||||
RValue.TextOnlyDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.TextOnlyDeriv (LValue).Choice (
|
||||
memo.TextOnlyDeriv (RValue));
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv ()
|
||||
{
|
||||
return LValue.MixedTextDeriv ().Choice (
|
||||
RValue.MixedTextDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.MixedTextDeriv (LValue).Choice (
|
||||
memo.MixedTextDeriv (RValue));
|
||||
}
|
||||
|
||||
public override RdpPattern ApplyAfter (RdpApplyAfterHandler handler)
|
||||
{
|
||||
// return handler (LValue).Choice (handler (RValue));
|
||||
@@ -950,12 +804,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
#endif
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern lDeriv = memo.StartTagOpenDeriv (LValue, name, ns);
|
||||
return lDeriv.Choice (memo.StartTagOpenDeriv (RValue, name, ns));
|
||||
}
|
||||
|
||||
// attDeriv cx (Choice p1 p2) att =
|
||||
// choice (attDeriv cx p1 att) (attDeriv cx p2 att)
|
||||
public override RdpPattern AttDeriv (string name, string ns, string value, XmlReader reader)
|
||||
@@ -964,28 +812,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
.Choice (RValue.AttDeriv (name, ns, value, reader));
|
||||
}
|
||||
|
||||
public override RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
RdpPattern lDeriv = LValue.StartAttDeriv (name, ns);
|
||||
return lDeriv.Choice (RValue.StartAttDeriv (name, ns));
|
||||
}
|
||||
|
||||
internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
return memo.StartAttDeriv (LValue, name, ns)
|
||||
.Choice (memo.StartAttDeriv (RValue, name, ns));
|
||||
}
|
||||
|
||||
public override RdpPattern EndAttDeriv ()
|
||||
{
|
||||
return LValue.EndAttDeriv ().Choice (RValue.EndAttDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern EndAttDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.EndAttDeriv (LValue).Choice (memo.EndAttDeriv (RValue));
|
||||
}
|
||||
|
||||
// startTagCloseDeriv (Choice p1 p2) =
|
||||
// choice (startTagCloseDeriv p1) (startTagCloseDeriv p2)
|
||||
public override RdpPattern StartTagCloseDeriv ()
|
||||
@@ -994,22 +820,11 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
.Choice (RValue.StartTagCloseDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.StartTagCloseDeriv (LValue)
|
||||
.Choice (memo.StartTagCloseDeriv (RValue));
|
||||
}
|
||||
|
||||
public override RdpPattern EndTagDeriv ()
|
||||
{
|
||||
return LValue.EndTagDeriv ().Choice (RValue.EndTagDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern EndTagDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.EndTagDeriv (LValue).Choice (memo.EndTagDeriv (RValue));
|
||||
}
|
||||
|
||||
internal override void CheckConstraints (bool attribute, bool oneOrMore, bool oneOrMoreGroup, bool oneOrMoreInterleave, bool list, bool dataExcept)
|
||||
{
|
||||
LValue.CheckConstraints (attribute, oneOrMore, oneOrMoreGroup, oneOrMoreInterleave, list, dataExcept);
|
||||
@@ -1035,14 +850,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
}
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return LValue.IsTextValueDependent || RValue.IsTextValueDependent; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return LValue.IsContextDependent || RValue.IsContextDependent; }
|
||||
}
|
||||
|
||||
public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
|
||||
{
|
||||
LValue.GetLabels (elements, attributes, collectNameClass);
|
||||
@@ -1072,40 +879,16 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
.Choice (LValue.Interleave (RValue.TextDeriv (s, reader)));
|
||||
}
|
||||
|
||||
internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
|
||||
{
|
||||
return memo.TextDeriv (LValue, s, reader).Interleave (RValue)
|
||||
.Choice (LValue.Interleave (memo.TextDeriv (RValue, s, reader)));
|
||||
}
|
||||
|
||||
internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.EmptyTextDeriv (LValue).Interleave (RValue)
|
||||
.Choice (LValue.Interleave (memo.EmptyTextDeriv (RValue)));
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv ()
|
||||
{
|
||||
return LValue.TextOnlyDeriv ().Interleave (
|
||||
RValue.TextOnlyDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.TextOnlyDeriv (LValue).Interleave (
|
||||
memo.TextOnlyDeriv (RValue));
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv ()
|
||||
{
|
||||
return LValue.MixedTextDeriv ().Interleave (RValue).Choice (
|
||||
LValue.Interleave (RValue.MixedTextDeriv ()));
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.MixedTextDeriv (LValue).Interleave (RValue).Choice (
|
||||
LValue.Interleave (memo.MixedTextDeriv (RValue)));
|
||||
return MakeInterleave (LValue.MixedTextDeriv (), RValue).Choice (
|
||||
MakeInterleave (LValue, RValue.MixedTextDeriv ()));
|
||||
}
|
||||
|
||||
// => choice (applyAfter (flip interleave p2) (startTagOpenDeriv p1 qn)) (applyAfter (interleave p1) (startTagOpenDeriv p2 qn)
|
||||
@@ -1120,16 +903,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return choiceL.Choice (choiceR);
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern handledL = memo.StartTagOpenDeriv (LValue, name, ns);
|
||||
RdpPattern handledR = memo.StartTagOpenDeriv (RValue, name, ns);
|
||||
RdpFlip flipL = MakeFlip (RdpUtil.InterleaveFunction, RValue);
|
||||
RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
|
||||
RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Interleave));
|
||||
return choiceL.Choice (choiceR);
|
||||
}
|
||||
|
||||
// attDeriv cx (Interleave p1 p2) att =
|
||||
// choice (interleave (attDeriv cx p1 att) p2)
|
||||
// (interleave p1 (attDeriv cx p2 att))
|
||||
@@ -1141,26 +914,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
RValue.AttDeriv (name, ns, value, reader)));
|
||||
}
|
||||
|
||||
public override RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
RdpPattern handledL = LValue.StartAttDeriv (name, ns);
|
||||
RdpPattern handledR = RValue.StartAttDeriv (name, ns);
|
||||
RdpFlip flipL = MakeFlip (RdpUtil.InterleaveFunction, RValue);
|
||||
RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
|
||||
RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Interleave));
|
||||
return choiceL.Choice (choiceR);
|
||||
}
|
||||
|
||||
internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern handledL = memo.StartAttDeriv (LValue, name, ns);
|
||||
RdpPattern handledR = memo.StartAttDeriv (RValue, name, ns);
|
||||
RdpFlip flipL = MakeFlip (RdpUtil.InterleaveFunction, RValue);
|
||||
RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
|
||||
RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Interleave));
|
||||
return choiceL.Choice (choiceR);
|
||||
}
|
||||
|
||||
// startTagCloseDeriv (Interleave p1 p2) =
|
||||
// interleave (startTagCloseDeriv p1) (startTagCloseDeriv p2)
|
||||
public override RdpPattern StartTagCloseDeriv ()
|
||||
@@ -1169,12 +922,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
.Interleave (RValue.StartTagCloseDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.StartTagCloseDeriv (LValue)
|
||||
.Interleave (memo.StartTagCloseDeriv (RValue));
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Interleave; }
|
||||
}
|
||||
@@ -1217,14 +964,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
}
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return LValue.IsTextValueDependent || (LValue.Nullable ? RValue.IsTextValueDependent : false); }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return LValue.IsContextDependent || (LValue.Nullable ? RValue.IsContextDependent : false); }
|
||||
}
|
||||
|
||||
public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
|
||||
{
|
||||
LValue.GetLabels (elements, attributes, collectNameClass);
|
||||
@@ -1236,43 +975,15 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
|
||||
public override RdpPattern TextDeriv (string s, XmlReader reader)
|
||||
{
|
||||
RdpPattern p = LValue.TextDeriv (s, reader);
|
||||
p = (p.PatternType == RelaxngPatternType.NotAllowed) ?
|
||||
p : p.Group (RValue);
|
||||
RdpPattern p = LValue.TextDeriv (s, reader).Group (RValue);
|
||||
return LValue.Nullable ?
|
||||
p.Choice (RValue.TextDeriv (s, reader)) : p;
|
||||
}
|
||||
|
||||
internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.TextDeriv (LValue, s, reader);
|
||||
p = (p.PatternType == RelaxngPatternType.NotAllowed) ?
|
||||
p : p.Group (RValue);
|
||||
return LValue.Nullable ?
|
||||
p.Choice (memo.TextDeriv (RValue, s, reader)) : p;
|
||||
}
|
||||
|
||||
internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.EmptyTextDeriv (LValue);
|
||||
p = p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (RValue);
|
||||
return LValue.Nullable ?
|
||||
p.Choice (memo.EmptyTextDeriv (RValue)) : p;
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv ()
|
||||
{
|
||||
RdpPattern p = LValue.TextOnlyDeriv ();
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (RValue.TextOnlyDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.TextOnlyDeriv (LValue);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (memo.TextOnlyDeriv (RValue));
|
||||
return LValue.TextOnlyDeriv ().Group (
|
||||
RValue.TextOnlyDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv ()
|
||||
@@ -1282,13 +993,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
p.Choice (RValue.MixedTextDeriv ()) : p;
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.MixedTextDeriv (LValue).Group (RValue);
|
||||
return LValue.Nullable ?
|
||||
p.Choice (memo.MixedTextDeriv (RValue)) : p;
|
||||
}
|
||||
|
||||
// startTagOpenDeriv (Group p1 p2) qn =
|
||||
// let x = applyAfter (flip group p2) (startTagOpenDeriv p1 qn)
|
||||
// in if nullable p1 then
|
||||
@@ -1306,17 +1010,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return x;
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern handled = memo.StartTagOpenDeriv (LValue, name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.GroupFunction, RValue);
|
||||
RdpPattern x = handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
|
||||
if (LValue.Nullable)
|
||||
return x.Choice (memo.StartTagOpenDeriv (RValue, name, ns));
|
||||
else
|
||||
return x;
|
||||
}
|
||||
|
||||
// attDeriv cx (Group p1 p2) att =
|
||||
// choice (group (attDeriv cx p1 att) p2)
|
||||
// (group p1 (attDeriv cx p2 att))
|
||||
@@ -1327,41 +1020,12 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
RValue.AttDeriv (name, ns, value, reader)));
|
||||
}
|
||||
|
||||
// startAttDeriv (group p1 p2) == startAttDeriv (interleave p1 p2)
|
||||
public override RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
RdpPattern handledL = LValue.StartAttDeriv (name, ns);
|
||||
RdpPattern handledR = RValue.StartAttDeriv (name, ns);
|
||||
RdpFlip flipL = MakeFlip (RdpUtil.GroupFunction, RValue);
|
||||
RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
|
||||
RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Group));
|
||||
return choiceL.Choice (choiceR);
|
||||
}
|
||||
|
||||
internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern handledL = memo.StartAttDeriv (LValue, name, ns);
|
||||
RdpPattern handledR = memo.StartAttDeriv (RValue, name, ns);
|
||||
RdpFlip flipL = MakeFlip (RdpUtil.GroupFunction, RValue);
|
||||
RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
|
||||
RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Group));
|
||||
return choiceL.Choice (choiceR);
|
||||
}
|
||||
|
||||
// startTagCloseDeriv (Group p1 p2) =
|
||||
// group (startTagCloseDeriv p1) (startTagCloseDeriv p2)
|
||||
public override RdpPattern StartTagCloseDeriv ()
|
||||
{
|
||||
RdpPattern p = LValue.StartTagCloseDeriv ();
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (RValue.StartTagCloseDeriv ());
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.StartTagCloseDeriv (LValue);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (memo.StartTagCloseDeriv (RValue));
|
||||
return LValue.StartTagCloseDeriv ()
|
||||
.Group (RValue.StartTagCloseDeriv ());
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
@@ -1437,14 +1101,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return Child.Nullable; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return Child.IsTextValueDependent; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return Child.IsContextDependent; }
|
||||
}
|
||||
|
||||
public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
|
||||
{
|
||||
Child.GetLabels (elements, attributes, collectNameClass);
|
||||
@@ -1469,23 +1125,7 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
|
||||
public override RdpPattern TextDeriv (string s, XmlReader reader)
|
||||
{
|
||||
RdpPattern p = Child.TextDeriv (s, reader);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (this.Choice (RdpEmpty.Instance));
|
||||
}
|
||||
|
||||
internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.TextDeriv (Child, s, reader);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (this.Choice (RdpEmpty.Instance));
|
||||
}
|
||||
|
||||
internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.EmptyTextDeriv (Child);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (this.Choice (RdpEmpty.Instance));
|
||||
return Child.TextDeriv (s, reader).Group (this.Choice (RdpEmpty.Instance));
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv ()
|
||||
@@ -1493,32 +1133,24 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return Child.TextOnlyDeriv ().OneOrMore ();
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.TextOnlyDeriv (Child).OneOrMore ();
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv ()
|
||||
{
|
||||
RdpPattern p = Child.MixedTextDeriv ();
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (this.Choice (RdpEmpty.Instance));
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
RdpPattern p = memo.MixedTextDeriv (Child);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (this.Choice (RdpEmpty.Instance));
|
||||
return Child.MixedTextDeriv ().Group (
|
||||
this.Choice (RdpEmpty.Instance));
|
||||
}
|
||||
|
||||
// attDeriv cx (OneOrMore p) att =
|
||||
// group (attDeriv cx p att) (choice (OneOrMore p) Empty)
|
||||
public override RdpPattern AttDeriv (string name, string ns, string value, XmlReader reader)
|
||||
{
|
||||
RdpPattern p = Child.AttDeriv (name, ns, value, reader);
|
||||
return p.PatternType == RelaxngPatternType.NotAllowed ?
|
||||
p : p.Group (Choice (RdpEmpty.Instance));
|
||||
#if UseStatic
|
||||
return RdpUtil.Group (
|
||||
RdpUtil.AttDeriv (ctx, children, att),
|
||||
RdpUtil.Choice (RdpUtil.OneOrMore (children), RdpEmpty.Instance));
|
||||
#else
|
||||
return Child.AttDeriv (name, ns, value, reader)
|
||||
.Group (Choice (RdpEmpty.Instance));
|
||||
#endif
|
||||
}
|
||||
|
||||
// startTagOpenDeriv (OneOrMore p) qn =
|
||||
@@ -1532,30 +1164,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern rest = RdpEmpty.Instance.Choice (Child.OneOrMore ());
|
||||
RdpPattern handled = memo.StartTagOpenDeriv (Child, name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.GroupFunction, rest);
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
|
||||
}
|
||||
|
||||
public override RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
RdpPattern rest = RdpEmpty.Instance.Choice (Child.OneOrMore ());
|
||||
RdpPattern handled = Child.StartAttDeriv (name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.GroupFunction, rest);
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
|
||||
}
|
||||
|
||||
internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern rest = RdpEmpty.Instance.Choice (Child.OneOrMore ());
|
||||
RdpPattern handled = memo.StartAttDeriv (Child, name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.GroupFunction, rest);
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
|
||||
}
|
||||
|
||||
// startTagCloseDeriv (OneOrMore p) =
|
||||
// oneOrMore (startTagCloseDeriv p)
|
||||
public override RdpPattern StartTagCloseDeriv ()
|
||||
@@ -1568,11 +1176,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
#endif
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.StartTagCloseDeriv (Child).OneOrMore ();
|
||||
}
|
||||
|
||||
internal override void CheckConstraints (bool attribute, bool oneOrMore, bool oneOrMoreGroup, bool oneOrMoreInterleave, bool list, bool dataExcept)
|
||||
{
|
||||
if (dataExcept)
|
||||
@@ -1607,14 +1210,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return Child.IsContextDependent; }
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.List; }
|
||||
}
|
||||
@@ -1666,14 +1261,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return dt.IsContextDependent; }
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Data; }
|
||||
}
|
||||
@@ -1794,14 +1381,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return dt.IsContextDependent; }
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Value; }
|
||||
}
|
||||
@@ -1815,19 +1394,7 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
// do nothing
|
||||
}
|
||||
|
||||
string cachedValue;
|
||||
RdpPattern cachedPattern;
|
||||
|
||||
public override RdpPattern TextDeriv (string s, XmlReader reader)
|
||||
{
|
||||
if (s == cachedValue && !IsContextDependent)
|
||||
return cachedPattern;
|
||||
cachedPattern = TextDerivCore (s, reader);
|
||||
cachedValue = s;
|
||||
return cachedPattern;
|
||||
}
|
||||
|
||||
RdpPattern TextDerivCore (string s, XmlReader reader)
|
||||
{
|
||||
if (dt.IsTypeEqual (value, s, reader))
|
||||
return RdpEmpty.Instance;
|
||||
@@ -1875,14 +1442,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Attribute; }
|
||||
}
|
||||
@@ -1946,29 +1505,12 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
#endif
|
||||
}
|
||||
|
||||
public override RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
return nameClass.Contains (name, ns) ?
|
||||
children.After (RdpEmpty.Instance) : RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
return nameClass.Contains (name, ns) ?
|
||||
children.After (RdpEmpty.Instance) : RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
// startTagCloseDeriv (Attribute _ _) = NotAllowed
|
||||
public override RdpPattern StartTagCloseDeriv ()
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal override void MarkReachableDefs ()
|
||||
{
|
||||
children.MarkReachableDefs ();
|
||||
@@ -2019,14 +1561,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Element; }
|
||||
}
|
||||
@@ -2084,11 +1618,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
|
||||
{
|
||||
return RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
public override RdpPattern StartTagOpenDeriv (string name, string ns)
|
||||
{
|
||||
#if UseStatic
|
||||
@@ -2103,13 +1632,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
#endif
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
return nameClass.Contains (name, ns) ?
|
||||
children.After (RdpEmpty.Instance) :
|
||||
RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
internal override void MarkReachableDefs ()
|
||||
{
|
||||
children.MarkReachableDefs ();
|
||||
@@ -2143,14 +1665,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
internal override bool IsTextValueDependent {
|
||||
get { return LValue.IsTextValueDependent; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return LValue.IsContextDependent; }
|
||||
}
|
||||
|
||||
public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
|
||||
{
|
||||
LValue.GetLabels (elements, attributes, collectNameClass);
|
||||
@@ -2161,36 +1675,16 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return LValue.TextDeriv (s, reader).After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
|
||||
{
|
||||
return memo.TextDeriv (LValue, s, reader).After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.EmptyTextDeriv (LValue).After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv ()
|
||||
{
|
||||
return LValue.TextOnlyDeriv ().After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.TextOnlyDeriv (LValue).After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv ()
|
||||
{
|
||||
return LValue.MixedTextDeriv ().After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.MixedTextDeriv (LValue).After (RValue);
|
||||
}
|
||||
|
||||
// startTagOpenDeriv (After p1 p2) qn =
|
||||
// applyAfter (flip after p2) (startTagOpenDeriv p1 qn)
|
||||
public override RdpPattern StartTagOpenDeriv (string name, string ns)
|
||||
@@ -2201,14 +1695,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
f.Apply));
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern handled = memo.StartTagOpenDeriv (LValue, name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.AfterFunction, RValue);
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (
|
||||
f.Apply));
|
||||
}
|
||||
|
||||
public override RdpPattern ApplyAfter (RdpApplyAfterHandler handler)
|
||||
{
|
||||
return LValue.After (handler (RValue));
|
||||
@@ -2221,37 +1707,11 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
return LValue.AttDeriv (name, ns, value, reader).After (RValue);
|
||||
}
|
||||
|
||||
public override RdpPattern StartAttDeriv (string name, string ns)
|
||||
{
|
||||
RdpPattern handled = LValue.StartAttDeriv (name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.AfterFunction, RValue);
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (
|
||||
f.Apply));
|
||||
}
|
||||
|
||||
internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
|
||||
{
|
||||
RdpPattern handled = memo.StartAttDeriv (LValue, name, ns);
|
||||
RdpFlip f = MakeFlip (RdpUtil.AfterFunction, RValue);
|
||||
return handled.ApplyAfter (new RdpApplyAfterHandler (
|
||||
f.Apply));
|
||||
}
|
||||
|
||||
public override RdpPattern EndAttDeriv ()
|
||||
{
|
||||
return LValue.Nullable ? RValue : RdpNotAllowed.Instance;
|
||||
}
|
||||
|
||||
public override RdpPattern StartTagCloseDeriv ()
|
||||
{
|
||||
return LValue.StartTagCloseDeriv ().After (RValue);
|
||||
}
|
||||
|
||||
internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
|
||||
{
|
||||
return memo.StartTagCloseDeriv (LValue).After (RValue);
|
||||
}
|
||||
|
||||
public override RdpPattern EndTagDeriv ()
|
||||
{
|
||||
return LValue.Nullable ? RValue : RdpNotAllowed.Instance;
|
||||
|
||||
@@ -91,22 +91,6 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
intl = DebugRdpPattern (b.LValue, visitedPattern) +
|
||||
DebugRdpPattern (b.RValue, visitedPattern);
|
||||
|
||||
RdpData data = p as RdpData;
|
||||
if (data != null)
|
||||
intl = String.Format ("name={0},ns={1},type={2} {3}",
|
||||
data.Datatype.LocalName,
|
||||
data.Datatype.NamespaceURI,
|
||||
data.Datatype.GetType (),
|
||||
data is RdpDataExcept ? DebugRdpPattern (((RdpDataExcept) data).Except, visitedPattern) : String.Empty);
|
||||
|
||||
RdpValue value = p as RdpValue;
|
||||
if (value != null)
|
||||
intl = String.Format ("name={0},ns={1},value={2} type={3}",
|
||||
value.Datatype.LocalName,
|
||||
value.Datatype.NamespaceURI,
|
||||
value.Value,
|
||||
value.Datatype.GetType ());
|
||||
|
||||
RdpElement el = p as RdpElement;
|
||||
if (el != null)
|
||||
intl = DebugNameClass (el.NameClass) +
|
||||
|
||||
@@ -1,54 +1,3 @@
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs : fixed warning.
|
||||
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs : just keep previous TextDeriv() result
|
||||
for each pattern; they are mostly not reused. It makes validator
|
||||
about 30% faster in certain validation and reduces memory use.
|
||||
|
||||
2006-01-13 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs : actually using Hashtable of Hashtable
|
||||
(instead of ArrayList of custom MemoizationStart class) is much
|
||||
better for performance. It makes StartTagOpenDeriv and
|
||||
StartAttDeriv more than 10x faster than before.
|
||||
|
||||
2006-01-13 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngDatatype.cs, RelaxngDefaultDatatypes.cs,
|
||||
XsdDatatypeProvider.cs, RelaxngValidatingReader.cs :
|
||||
Memoize TextDeriv() results for context independent inputs.
|
||||
|
||||
Due to the API freeze they are kept as internal virtual for now.
|
||||
|
||||
2006-01-12 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs : Use RdpPattern.EmptyTextDeriv(). It
|
||||
significantly improves performance wrt empty text nodes.
|
||||
|
||||
2006-01-10 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs :
|
||||
- Split memoization support things into MemoizationStore class.
|
||||
- Split single memo ArrayList into a couple of Hashtables and
|
||||
ArrayLists which memoize each kind of derivative results.
|
||||
- Introduced StartAttDeriv() and EndAttDeriv() to replace AttDeriv()
|
||||
and memoize results efficiently. It is textually written in the
|
||||
"derivative algorithm", but not formally specified.
|
||||
- Introduced IsTextValueDependent and EmptyTextDeriv() to
|
||||
differentiate those patterns which results differ depending on
|
||||
the text value and those which doesn't.
|
||||
Those EmptyTextDeriv results are memoized.
|
||||
|
||||
2006-01-10 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Misc.cs : NormalizeWhitespace() was creating extraneous char[] and
|
||||
it could be heavily called depending on patterns.
|
||||
* RelaxngDefaultDatatypes.cs : avoid extraneous call to
|
||||
NormalizeWhitespace().
|
||||
|
||||
2006-01-05 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs :
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Xml;
|
||||
using Commons.Xml.Relaxng.Derivative;
|
||||
|
||||
@@ -46,42 +45,28 @@ namespace Commons.Xml.Relaxng
|
||||
if (s.Length == 0)
|
||||
return s;
|
||||
|
||||
StringBuilder sb = null;
|
||||
int noSpaceIndex = 0;
|
||||
bool inSpace = false;
|
||||
|
||||
for (int i = 0; i < s.Length; i++) {
|
||||
switch (s [i]) {
|
||||
char [] ca = s.ToCharArray ();
|
||||
int j = 0;
|
||||
for (int i = 0; i < ca.Length; i++) {
|
||||
switch (ca [i]) {
|
||||
case ' ':
|
||||
case '\r':
|
||||
case '\t':
|
||||
case '\n':
|
||||
if (inSpace)
|
||||
continue;
|
||||
if (sb == null)
|
||||
sb = new StringBuilder (s.Length);
|
||||
if (noSpaceIndex < i) {
|
||||
if (sb.Length > 0)
|
||||
sb.Append (' ');
|
||||
sb.Append (s, noSpaceIndex, i - noSpaceIndex);
|
||||
}
|
||||
inSpace = true;
|
||||
if (j == 0)
|
||||
break;
|
||||
if (ca [j - 1] != ' ')
|
||||
ca [j++] = ' ';
|
||||
break;
|
||||
default:
|
||||
if (inSpace) {
|
||||
noSpaceIndex = i;
|
||||
inSpace = false;
|
||||
}
|
||||
ca [j++] = ca [i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (sb == null)
|
||||
return s;
|
||||
if (!inSpace && noSpaceIndex < s.Length) {
|
||||
sb.Append (' ');
|
||||
sb.Append (s, noSpaceIndex, s.Length - noSpaceIndex);
|
||||
}
|
||||
return sb.ToString ();
|
||||
if (j == 0)
|
||||
return String.Empty;
|
||||
string r = new string (ca, 0, (ca [j - 1] != ' ') ? j : j - 1);
|
||||
return r;
|
||||
}
|
||||
|
||||
public static bool IsWhitespace (string s)
|
||||
|
||||
@@ -38,11 +38,6 @@ namespace Commons.Xml.Relaxng
|
||||
public abstract string Name { get; }
|
||||
public abstract string NamespaceURI { get; }
|
||||
|
||||
internal virtual bool IsContextDependent {
|
||||
// safe default value
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
public abstract object Parse (string text, XmlReader reader);
|
||||
|
||||
public virtual bool Compare (object o1, object o2)
|
||||
|
||||
@@ -48,10 +48,6 @@ namespace Commons.Xml.Relaxng
|
||||
public override string Name { get { return "string"; } }
|
||||
public override string NamespaceURI { get { return String.Empty; } }
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
public override bool IsValid (string text, XmlReader reader)
|
||||
{
|
||||
return true;
|
||||
@@ -83,10 +79,6 @@ namespace Commons.Xml.Relaxng
|
||||
public override string Name { get { return "token"; } }
|
||||
public override string NamespaceURI { get { return String.Empty; } }
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return false; }
|
||||
}
|
||||
|
||||
public override bool IsValid (string text, XmlReader reader)
|
||||
{
|
||||
return true;
|
||||
@@ -97,55 +89,10 @@ namespace Commons.Xml.Relaxng
|
||||
return Util.NormalizeWhitespace (text);
|
||||
}
|
||||
|
||||
int SkipWhitespaces (string s, int i)
|
||||
{
|
||||
while (i < s.Length) {
|
||||
switch (s [i]) {
|
||||
case '\n': case '\r': case ' ': case '\t':
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
public override bool Compare (object o1, object o2)
|
||||
{
|
||||
string s1 = o1 as string;
|
||||
string s2 = o2 as string;
|
||||
|
||||
int i1 = 0;
|
||||
int i2 = 0;
|
||||
|
||||
while (i1 < s1.Length && i2 < s2.Length) {
|
||||
i1 = SkipWhitespaces (s1, i1);
|
||||
i2 = SkipWhitespaces (s2, i2);
|
||||
while (i1 < s1.Length && i2 < s2.Length) {
|
||||
if (s1 [i1] != s2 [i2])
|
||||
return false;
|
||||
i1++;
|
||||
i2++;
|
||||
if (i1 == s1.Length || i2 == s2.Length)
|
||||
break;
|
||||
if (XmlChar.IsWhitespace (s1 [i1])) {
|
||||
if (!XmlChar.IsWhitespace (s2 [i2]))
|
||||
return false;
|
||||
else
|
||||
break;
|
||||
}
|
||||
else if (XmlChar.IsWhitespace (s2 [i2]))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
i1 = SkipWhitespaces (s1, i1);
|
||||
i2 = SkipWhitespaces (s2, i2);
|
||||
return i1 == s1.Length && i2 == s2.Length;
|
||||
}
|
||||
|
||||
public override bool CompareString (string s1, string s2, XmlReader reader)
|
||||
{
|
||||
return Compare (s1, s2);
|
||||
return Util.NormalizeWhitespace ((string) o1) ==
|
||||
Util.NormalizeWhitespace ((string) o2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -68,8 +68,11 @@ namespace Commons.Xml.Relaxng
|
||||
RelaxngPattern pattern;
|
||||
RdpPattern vState;
|
||||
RdpPattern prevState; // Mainly for debugging.
|
||||
ArrayList PredefinedAttributes = new ArrayList ();
|
||||
bool labelsComputed;
|
||||
Hashtable elementLabels = new Hashtable ();
|
||||
Hashtable attributeLabels = new Hashtable ();
|
||||
bool isEmptiable;
|
||||
bool roughLabelCheck;
|
||||
ArrayList strictCheckCache;
|
||||
bool reportDetails;
|
||||
@@ -365,6 +368,7 @@ namespace Commons.Xml.Relaxng
|
||||
{
|
||||
PrepareState ();
|
||||
|
||||
labelsComputed = false;
|
||||
elementLabels.Clear ();
|
||||
attributeLabels.Clear ();
|
||||
|
||||
@@ -383,7 +387,7 @@ namespace Commons.Xml.Relaxng
|
||||
inContent = true;
|
||||
// StartTagOpenDeriv
|
||||
prevState = vState;
|
||||
vState = memo.StartTagOpenDeriv (vState,
|
||||
vState = StartTagOpenDeriv (vState,
|
||||
reader.LocalName, reader.NamespaceURI);
|
||||
if (vState.PatternType == RelaxngPatternType.NotAllowed)
|
||||
throw CreateValidationError (String.Format ("Invalid start tag found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), true);
|
||||
@@ -397,36 +401,16 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
prevState = vState;
|
||||
string attrNS = reader.NamespaceURI;
|
||||
|
||||
#if false // old code
|
||||
|
||||
vState = vState.AttDeriv (reader.LocalName, attrNS, reader.GetAttribute (reader.LocalName, attrNS), this);
|
||||
if (vState == RdpNotAllowed.Instance)
|
||||
if (vState.PatternType == RelaxngPatternType.NotAllowed)
|
||||
throw CreateValidationError (String.Format ("Invalid attribute found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), false);
|
||||
|
||||
#else
|
||||
|
||||
prevState = vState;
|
||||
vState = memo.StartAttDeriv (vState, reader.LocalName, attrNS);
|
||||
if (vState == RdpNotAllowed.Instance)
|
||||
throw CreateValidationError (String.Format ("Invalid attribute found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), false);
|
||||
prevState = vState;
|
||||
vState = memo.TextOnlyDeriv (vState);
|
||||
vState = TextDeriv (vState, reader.Value, reader);
|
||||
if (Util.IsWhitespace (reader.Value))
|
||||
vState = vState.Choice (prevState);
|
||||
vState = memo.EndAttDeriv (vState);
|
||||
if (vState == RdpNotAllowed.Instance)
|
||||
throw CreateValidationError (String.Format ("Invalid attribute value is found. Value = '{0}'", reader.Value), false);
|
||||
|
||||
#endif
|
||||
} while (reader.MoveToNextAttribute ());
|
||||
MoveToElement ();
|
||||
}
|
||||
|
||||
// StarTagCloseDeriv
|
||||
prevState = vState;
|
||||
vState = memo.StartTagCloseDeriv (vState);
|
||||
vState = StartTagCloseDeriv (vState);
|
||||
if (vState.PatternType == RelaxngPatternType.NotAllowed)
|
||||
throw CreateValidationError (String.Format ("Invalid start tag closing found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), false);
|
||||
|
||||
@@ -441,7 +425,7 @@ namespace Commons.Xml.Relaxng
|
||||
inContent = false;
|
||||
// EndTagDeriv
|
||||
prevState = vState;
|
||||
vState = memo.EndTagDeriv (vState);
|
||||
vState = EndTagDeriv (vState);
|
||||
if (vState.PatternType == RelaxngPatternType.NotAllowed)
|
||||
throw CreateValidationError (String.Format ("Invalid end tag found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), true);
|
||||
break;
|
||||
@@ -466,14 +450,6 @@ namespace Commons.Xml.Relaxng
|
||||
return ret;
|
||||
}
|
||||
|
||||
RdpPattern TextDeriv (RdpPattern p, string value, XmlReader context)
|
||||
{
|
||||
if (value.Length > 0 && p.IsTextValueDependent)
|
||||
return memo.TextDeriv (p, value, context);
|
||||
else
|
||||
return memo.EmptyTextDeriv (p);
|
||||
}
|
||||
|
||||
void ValidateText (bool remain)
|
||||
{
|
||||
RdpPattern ts = vState;
|
||||
@@ -486,8 +462,8 @@ namespace Commons.Xml.Relaxng
|
||||
case XmlNodeType.Element:
|
||||
startElementDepth = -1;
|
||||
if (!Util.IsWhitespace (cachedValue)) {
|
||||
ts = memo.MixedTextDeriv (ts);
|
||||
ts = TextDeriv (ts, cachedValue, reader);
|
||||
ts = MixedTextDeriv (ts);
|
||||
ts = ts.TextDeriv (cachedValue, reader);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -523,167 +499,125 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
RdpPattern ValidateTextOnlyCore ()
|
||||
{
|
||||
RdpPattern ts = memo.TextOnlyDeriv (vState);
|
||||
ts = TextDeriv (ts, cachedValue, reader);
|
||||
RdpPattern ts = TextOnlyDeriv (vState);
|
||||
ts = ts.TextDeriv (cachedValue, reader);
|
||||
if (Util.IsWhitespace (cachedValue))
|
||||
ts = vState.Choice (ts);
|
||||
ts = vState.MakeChoice (ts, vState);
|
||||
return ts;
|
||||
}
|
||||
|
||||
MemoizationStore memo = new MemoizationStore ();
|
||||
}
|
||||
#region Memoization support
|
||||
|
||||
#region Memoization support
|
||||
internal class MemoizationStore
|
||||
{
|
||||
Hashtable startOpen = new Hashtable ();
|
||||
Hashtable startClose = new Hashtable ();
|
||||
Hashtable startAtt = new Hashtable ();
|
||||
Hashtable endTag = new Hashtable ();
|
||||
Hashtable endAtt = new Hashtable ();
|
||||
Hashtable textOnly = new Hashtable ();
|
||||
Hashtable mixedText = new Hashtable ();
|
||||
Hashtable emptyText = new Hashtable ();
|
||||
Hashtable text = new Hashtable ();
|
||||
Hashtable text_value = new Hashtable ();
|
||||
Hashtable qnames = new Hashtable ();
|
||||
ArrayList memo = new ArrayList ();
|
||||
|
||||
enum DerivativeType {
|
||||
StartTagOpen,
|
||||
StartAtt,
|
||||
StartTagClose,
|
||||
EndTag,
|
||||
EndAtt,
|
||||
Mixed,
|
||||
TextOnly
|
||||
}
|
||||
|
||||
XmlQualifiedName GetQName (string local, string ns)
|
||||
class Memoization
|
||||
{
|
||||
Hashtable nst = qnames [ns] as Hashtable;
|
||||
if (nst == null) {
|
||||
nst = new Hashtable ();
|
||||
qnames [ns] = nst;
|
||||
public Memoization (DerivativeType type, RdpPattern input, RdpPattern output)
|
||||
{
|
||||
Type = type;
|
||||
Input = input;
|
||||
Output = output;
|
||||
}
|
||||
XmlQualifiedName qn = nst [local] as XmlQualifiedName;
|
||||
if (qn == null) {
|
||||
qn = new XmlQualifiedName (local, ns);
|
||||
nst [local] = qn;
|
||||
|
||||
public readonly DerivativeType Type;
|
||||
public readonly RdpPattern Input;
|
||||
public readonly RdpPattern Output;
|
||||
}
|
||||
|
||||
class MemoizationStartTagOpen : Memoization
|
||||
{
|
||||
public MemoizationStartTagOpen (string name, string ns, RdpPattern input, RdpPattern output)
|
||||
: base (DerivativeType.StartTagOpen, input, output)
|
||||
{
|
||||
Name = name;
|
||||
NS = ns;
|
||||
}
|
||||
return qn;
|
||||
|
||||
public readonly string Name;
|
||||
public readonly string NS;
|
||||
}
|
||||
|
||||
public RdpPattern StartTagOpenDeriv (RdpPattern p, string local, string ns)
|
||||
RdpPattern StartTagOpenDeriv (RdpPattern p, string local, string ns)
|
||||
{
|
||||
Hashtable h = startOpen [p] as Hashtable;
|
||||
if (h == null) {
|
||||
h = new Hashtable ();
|
||||
startOpen [p] = h;
|
||||
for (int i = 0; i < memo.Count; i++) {
|
||||
Memoization tag = (Memoization) memo [i];
|
||||
if (tag.Type != DerivativeType.StartTagOpen)
|
||||
continue;
|
||||
MemoizationStartTagOpen sto =
|
||||
tag as MemoizationStartTagOpen;
|
||||
if (sto.Input == p &&
|
||||
object.ReferenceEquals (sto.Name, local) &&
|
||||
object.ReferenceEquals (sto.NS, ns))
|
||||
return tag.Output;
|
||||
}
|
||||
XmlQualifiedName qn = GetQName (local, ns);
|
||||
RdpPattern m = h [qn] as RdpPattern;
|
||||
if (m == null) {
|
||||
m = p.StartTagOpenDeriv (local, ns, this);
|
||||
h [qn] = m;
|
||||
|
||||
RdpPattern m = p.StartTagOpenDeriv (local, ns);
|
||||
memo.Add (new MemoizationStartTagOpen (local, ns, p, m));
|
||||
return m;
|
||||
}
|
||||
|
||||
RdpPattern StartTagCloseDeriv (RdpPattern p)
|
||||
{
|
||||
for (int i = 0; i < memo.Count; i++) {
|
||||
Memoization tag = (Memoization) memo [i];
|
||||
if (tag.Type == DerivativeType.StartTagClose && tag.Input == p)
|
||||
return tag.Output;
|
||||
}
|
||||
|
||||
RdpPattern m = p.StartTagCloseDeriv ();
|
||||
memo.Add (new Memoization (
|
||||
DerivativeType.StartTagClose, p, m));
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern StartAttDeriv (RdpPattern p, string local, string ns)
|
||||
RdpPattern EndTagDeriv (RdpPattern p)
|
||||
{
|
||||
Hashtable h = startAtt [p] as Hashtable;
|
||||
if (h == null) {
|
||||
h = new Hashtable ();
|
||||
startAtt [p] = h;
|
||||
for (int i = 0; i < memo.Count; i++) {
|
||||
Memoization tag = (Memoization) memo [i];
|
||||
if (tag.Type == DerivativeType.EndTag && tag.Input == p)
|
||||
return tag.Output;
|
||||
}
|
||||
XmlQualifiedName qn = GetQName (local, ns);
|
||||
RdpPattern m = h [qn] as RdpPattern;
|
||||
if (m == null) {
|
||||
m = p.StartAttDeriv (local, ns, this);
|
||||
h [qn] = m;
|
||||
|
||||
RdpPattern m = p.EndTagDeriv ();
|
||||
memo.Add (new Memoization (DerivativeType.EndTag, p, m));
|
||||
return m;
|
||||
}
|
||||
|
||||
RdpPattern MixedTextDeriv (RdpPattern p)
|
||||
{
|
||||
for (int i = 0; i < memo.Count; i++) {
|
||||
Memoization tag = (Memoization) memo [i];
|
||||
if (tag.Type == DerivativeType.Mixed && tag.Input == p)
|
||||
return tag.Output;
|
||||
}
|
||||
|
||||
RdpPattern m = p.MixedTextDeriv ();
|
||||
memo.Add (new Memoization (DerivativeType.Mixed, p, m));
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern StartTagCloseDeriv (RdpPattern p)
|
||||
RdpPattern TextOnlyDeriv (RdpPattern p)
|
||||
{
|
||||
RdpPattern m = startClose [p] as RdpPattern;
|
||||
if (m != null)
|
||||
return m;
|
||||
for (int i = 0; i < memo.Count; i++) {
|
||||
Memoization tag = (Memoization) memo [i];
|
||||
if (tag.Type == DerivativeType.TextOnly && tag.Input == p)
|
||||
return tag.Output;
|
||||
}
|
||||
|
||||
m = p.StartTagCloseDeriv (this);
|
||||
startClose [p] = m;
|
||||
RdpPattern m = p.TextOnlyDeriv ();
|
||||
memo.Add (new Memoization (DerivativeType.TextOnly, p, m));
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern EndTagDeriv (RdpPattern p)
|
||||
{
|
||||
RdpPattern m = endTag [p] as RdpPattern;
|
||||
if (m != null)
|
||||
return m;
|
||||
|
||||
m = p.EndTagDeriv (this);
|
||||
endTag [p] = m;
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern EndAttDeriv (RdpPattern p)
|
||||
{
|
||||
RdpPattern m = endAtt [p] as RdpPattern;
|
||||
if (m != null)
|
||||
return m;
|
||||
|
||||
m = p.EndAttDeriv (this);
|
||||
endAtt [p] = m;
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern MixedTextDeriv (RdpPattern p)
|
||||
{
|
||||
RdpPattern m = mixedText [p] as RdpPattern;
|
||||
if (m != null)
|
||||
return m;
|
||||
|
||||
m = p.MixedTextDeriv (this);
|
||||
mixedText [p] = m;
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern TextOnlyDeriv (RdpPattern p)
|
||||
{
|
||||
RdpPattern m = textOnly [p] as RdpPattern;
|
||||
if (m != null)
|
||||
return m;
|
||||
|
||||
m = p.TextOnlyDeriv (this);
|
||||
textOnly [p] = m;
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern TextDeriv (RdpPattern p, string value, XmlReader context)
|
||||
{
|
||||
if (p.IsContextDependent)
|
||||
return p.TextDeriv (value, context);
|
||||
|
||||
if (Object.ReferenceEquals (text_value [p], value))
|
||||
return text [p] as RdpPattern;
|
||||
RdpPattern m = p.TextDeriv (value, context, this);
|
||||
text_value [p] = value;
|
||||
text [p] = m;
|
||||
return m;
|
||||
}
|
||||
|
||||
public RdpPattern EmptyTextDeriv (RdpPattern p)
|
||||
{
|
||||
RdpPattern m = emptyText [p] as RdpPattern;
|
||||
if (m != null)
|
||||
return m;
|
||||
|
||||
m = p.EmptyTextDeriv (this);
|
||||
emptyText [p] = m;
|
||||
return m;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
@@ -197,10 +197,6 @@ namespace Commons.Xml.Relaxng.XmlSchema
|
||||
get { return type.QualifiedName.Namespace; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return type.Datatype != null && type.Datatype.TokenizedType == XmlTokenizedType.QName; }
|
||||
}
|
||||
|
||||
public override object Parse (string value, XmlReader reader)
|
||||
{
|
||||
// Now we create XmlValidatingReader to handle
|
||||
@@ -233,10 +229,6 @@ namespace Commons.Xml.Relaxng.XmlSchema
|
||||
dt = xstype;
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return dt.TokenizedType == XmlTokenizedType.QName; }
|
||||
}
|
||||
|
||||
public override string Name {
|
||||
get { return name; }
|
||||
}
|
||||
@@ -268,10 +260,6 @@ namespace Commons.Xml.Relaxng.XmlSchema
|
||||
get { return "http://www.w3.org/2001/XMLSchema-datatypes"; }
|
||||
}
|
||||
|
||||
internal override bool IsContextDependent {
|
||||
get { return true; }
|
||||
}
|
||||
|
||||
public override object Parse (string s, XmlReader reader)
|
||||
{
|
||||
int colonAt = s.IndexOf (':');
|
||||
|
||||
+42
-105
@@ -58,15 +58,22 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP51932 : MonoEncoding
|
||||
{
|
||||
// Magic number used by Windows for the EUC-JP code page.
|
||||
private const int EUC_JP_CODE_PAGE = 51932;
|
||||
|
||||
// Internal state.
|
||||
private JISConvert convert;
|
||||
|
||||
// Conversion cache (note that encoding is not thread safe)
|
||||
int lastByte;
|
||||
|
||||
// Constructor.
|
||||
public CP51932 () : base (EUC_JP_CODE_PAGE)
|
||||
{
|
||||
// Load the JIS conversion tables.
|
||||
convert = JISConvert.Convert;
|
||||
}
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
@@ -87,8 +94,8 @@ public class CP51932 : MonoEncoding
|
||||
// Determine the length of the final output.
|
||||
int length = 0;
|
||||
int ch, value;
|
||||
byte [] cjkToJis = JISConvert.Convert.cjkToJis;
|
||||
byte [] extraToJis = JISConvert.Convert.extraToJis;
|
||||
byte [] cjkToJis = convert.cjkToJis;
|
||||
byte [] extraToJis = convert.extraToJis;
|
||||
|
||||
while (count > 0) {
|
||||
ch = chars [index++];
|
||||
@@ -147,9 +154,9 @@ public class CP51932 : MonoEncoding
|
||||
int byteLength = byteCount;
|
||||
int ch, value;
|
||||
|
||||
byte[] cjkToJis = JISConvert.Convert.cjkToJis;
|
||||
byte[] greekToJis = JISConvert.Convert.greekToJis;
|
||||
byte[] extraToJis = JISConvert.Convert.extraToJis;
|
||||
byte[] cjkToJis = convert.cjkToJis;
|
||||
byte[] greekToJis = convert.greekToJis;
|
||||
byte[] extraToJis = convert.extraToJis;
|
||||
|
||||
for (; charCount > 0; charIndex++, --charCount) {
|
||||
ch = chars [charIndex];
|
||||
@@ -217,6 +224,7 @@ public class CP51932 : MonoEncoding
|
||||
}
|
||||
|
||||
// Get the number of characters needed to decode a byte buffer.
|
||||
// TODO: check
|
||||
public override int GetCharCount (byte [] bytes, int index, int count)
|
||||
{
|
||||
// Validate the parameters.
|
||||
@@ -231,96 +239,50 @@ public class CP51932 : MonoEncoding
|
||||
throw new ArgumentOutOfRangeException
|
||||
("count", Strings.GetString("ArgRange_Array"));
|
||||
|
||||
|
||||
|
||||
// Determine the total length of the converted string.
|
||||
int value = 0;
|
||||
byte[] table0208 = JISConvert.Convert.jisx0208ToUnicode;
|
||||
byte[] table0212 = JISConvert.Convert.jisx0212ToUnicode;
|
||||
int length = 0;
|
||||
int byteval = 0;
|
||||
int byteval;
|
||||
int last = 0;
|
||||
|
||||
while (count > 0) {
|
||||
byteval = bytes [index++];
|
||||
--count;
|
||||
|
||||
if (last == 0) {
|
||||
if (byteval == 0x8F) {
|
||||
if (byteval != 0) {
|
||||
// Invalid second byte of a 3-byte character.
|
||||
// Invalid second byte of a 3-byte character
|
||||
// FIXME: What should we do?
|
||||
last = 0;
|
||||
length++;
|
||||
}
|
||||
// First byte in a triple-byte sequence
|
||||
else
|
||||
last = byteval;
|
||||
} else if (byteval <= 0x7F) {
|
||||
// Ordinary ASCII/Latin1/Control character.
|
||||
length++;
|
||||
} else if (byteval == 0x8E) {
|
||||
// First byte of half-width Katakana
|
||||
last = byteval;
|
||||
++length;
|
||||
} else if (byteval >= 0xA1 && byteval <= 0xFE) {
|
||||
// First byte in a double-byte sequence.
|
||||
last = byteval;
|
||||
} else if (byteval == 0x87) {
|
||||
// First byte in half-width katakana
|
||||
} else {
|
||||
// Invalid first byte.
|
||||
length++;
|
||||
// Invalid first byte. Let '?'
|
||||
++length;
|
||||
}
|
||||
}
|
||||
else if (last == 0x8E) {
|
||||
if (byteval >= 0xA1 && byteval <= 0xDF) {
|
||||
value = ((byteval - 0x40) |
|
||||
(last + 0x71) << 8);
|
||||
length++;
|
||||
} else {
|
||||
// Invalid second byte.
|
||||
length++;
|
||||
}
|
||||
last =0;
|
||||
}
|
||||
else if (last == 0x8F) {
|
||||
} else if (last == 0x8F) {
|
||||
// 3-byte character
|
||||
// FIXME: currently not supported yet
|
||||
last = byteval;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Second byte in a double-byte sequence.
|
||||
value = (last - 0xA1) * 0x5E;
|
||||
last = 0;
|
||||
if (byteval >= 0xA1 && byteval <= 0xFE)
|
||||
{
|
||||
value += (byteval - 0xA1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Invalid second byte.
|
||||
last = 0;
|
||||
length++;
|
||||
continue;
|
||||
}
|
||||
|
||||
value *= 2;
|
||||
value = ((int) (table0208 [value]))
|
||||
| (((int) (table0208 [value + 1])) << 8);
|
||||
if (value == 0)
|
||||
value = ((int) (table0212 [value]))
|
||||
| (((int) (table0212 [value + 1])) << 8);
|
||||
if (value != 0)
|
||||
length++;
|
||||
else
|
||||
length++;
|
||||
++length;
|
||||
} else {
|
||||
// Second byte in a double-byte sequence.
|
||||
last = 0;
|
||||
++length;
|
||||
}
|
||||
}
|
||||
#if NET_2_0
|
||||
// seems like .NET 2.0 adds \u30FB for insufficient
|
||||
// byte seuqence (for Japanese \u30FB makes sense).
|
||||
if (last != 0)
|
||||
length++;
|
||||
#endif
|
||||
|
||||
// Return the final length to the caller.
|
||||
// Return the total length.
|
||||
return length;
|
||||
}
|
||||
|
||||
@@ -357,29 +319,30 @@ public class CP51932 : MonoEncoding
|
||||
int posn = charIndex;
|
||||
int charLength = chars.Length;
|
||||
int byteval, value;
|
||||
int last = 0;
|
||||
byte[] table0208 = JISConvert.Convert.jisx0208ToUnicode;
|
||||
byte[] table0212 = JISConvert.Convert.jisx0212ToUnicode;
|
||||
int last = lastByte;
|
||||
byte[] table0208 = convert.jisx0208ToUnicode;
|
||||
byte[] table0212 = convert.jisx0212ToUnicode;
|
||||
|
||||
while (byteCount > 0) {
|
||||
byteval = bytes [byteIndex++];
|
||||
--byteCount;
|
||||
if (last == 0) {
|
||||
if (posn >= charLength)
|
||||
throw new ArgumentException
|
||||
(Strings.GetString
|
||||
("Arg_InsufficientSpace"), "chars");
|
||||
|
||||
if (byteval == 0x8F) {
|
||||
if (byteval != 0) {
|
||||
// Invalid second byte of a 3-byte character.
|
||||
// Invalid second byte of a 3-byte character
|
||||
// FIXME: What should we do?
|
||||
last = 0;
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
chars [posn++] = '?';
|
||||
}
|
||||
// First byte in a triple-byte sequence
|
||||
else
|
||||
last = byteval;
|
||||
} else if (byteval <= 0x7F) {
|
||||
// Ordinary ASCII/Latin1/Control character.
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
chars [posn++] = (char) byteval;
|
||||
} else if (byteval == 0x8E) {
|
||||
// First byte of half-width Katakana
|
||||
@@ -389,8 +352,6 @@ public class CP51932 : MonoEncoding
|
||||
last = byteval;
|
||||
} else {
|
||||
// Invalid first byte.
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
chars [posn++] = '?';
|
||||
}
|
||||
}
|
||||
@@ -398,13 +359,9 @@ public class CP51932 : MonoEncoding
|
||||
if (byteval >= 0xA1 && byteval <= 0xDF) {
|
||||
value = ((byteval - 0x40) |
|
||||
(last + 0x71) << 8);
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
chars [posn++] = (char) value;
|
||||
} else {
|
||||
// Invalid second byte.
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
chars [posn++] = '?';
|
||||
}
|
||||
last =0;
|
||||
@@ -426,9 +383,7 @@ public class CP51932 : MonoEncoding
|
||||
else
|
||||
{
|
||||
// Invalid second byte.
|
||||
last = 0;
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
lastByte = 0;
|
||||
chars [posn++] = '?';
|
||||
continue;
|
||||
}
|
||||
@@ -439,35 +394,18 @@ public class CP51932 : MonoEncoding
|
||||
if (value == 0)
|
||||
value = ((int) (table0212 [value]))
|
||||
| (((int) (table0212 [value + 1])) << 8);
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
if (value != 0)
|
||||
chars [posn++] = (char)value;
|
||||
else
|
||||
chars [posn++] = '?';
|
||||
}
|
||||
}
|
||||
#if NET_2_0
|
||||
if (last != 0) {
|
||||
// seems like .NET 2.0 adds \u30FB for insufficient
|
||||
// byte seuqence (for Japanese \u30FB makes sense).
|
||||
if (posn >= charLength)
|
||||
throw Insufficient ();
|
||||
chars [posn++] = '\u30FB';
|
||||
}
|
||||
#endif
|
||||
lastByte = last;
|
||||
|
||||
// Return the final length to the caller.
|
||||
return posn - charIndex;
|
||||
}
|
||||
|
||||
Exception Insufficient ()
|
||||
{
|
||||
throw new ArgumentException
|
||||
(Strings.GetString
|
||||
("Arg_InsufficientSpace"), "chars");
|
||||
}
|
||||
|
||||
// Get the maximum number of bytes needed to encode a
|
||||
// specified number of characters.
|
||||
public override int GetMaxByteCount(int charCount)
|
||||
@@ -551,7 +489,6 @@ public class CP51932 : MonoEncoding
|
||||
#endif // !ECMA_COMPAT
|
||||
}; // class CP51932
|
||||
|
||||
[Serializable]
|
||||
public class ENCeuc_jp : CP51932
|
||||
{
|
||||
public ENCeuc_jp () : base() {}
|
||||
|
||||
+20
-17
@@ -29,16 +29,20 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public unsafe class CP932 : MonoEncoding
|
||||
{
|
||||
// Magic number used by Windows for the Shift-JIS code page.
|
||||
private const int SHIFTJIS_CODE_PAGE = 932;
|
||||
|
||||
// Internal state.
|
||||
private JISConvert convert;
|
||||
|
||||
// Constructor.
|
||||
public CP932() : base(SHIFTJIS_CODE_PAGE)
|
||||
{
|
||||
}
|
||||
{
|
||||
// Load the JIS conversion tables.
|
||||
convert = JISConvert.Convert;
|
||||
}
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public override int GetByteCount(char[] chars, int index, int count)
|
||||
@@ -63,11 +67,11 @@ public unsafe class CP932 : MonoEncoding
|
||||
int length = 0;
|
||||
int ch, value;
|
||||
#if __PNET__
|
||||
byte *cjkToJis = JISConvert.Convert.cjkToJis;
|
||||
byte *extraToJis = JISConvert.Convert.extraToJis;
|
||||
byte *cjkToJis = convert.cjkToJis;
|
||||
byte *extraToJis = convert.extraToJis;
|
||||
#else
|
||||
byte[] cjkToJis = JISConvert.Convert.cjkToJis;
|
||||
byte[] extraToJis = JISConvert.Convert.extraToJis;
|
||||
byte[] cjkToJis = convert.cjkToJis;
|
||||
byte[] extraToJis = convert.extraToJis;
|
||||
#endif
|
||||
while(count > 0)
|
||||
{
|
||||
@@ -143,13 +147,13 @@ public unsafe class CP932 : MonoEncoding
|
||||
int byteLength = byteCount;
|
||||
int ch, value;
|
||||
#if __PNET__
|
||||
byte *cjkToJis = JISConvert.Convert.cjkToJis;
|
||||
byte *greekToJis = JISConvert.Convert.greekToJis;
|
||||
byte *extraToJis = JISConvert.Convert.extraToJis;
|
||||
byte *cjkToJis = convert.cjkToJis;
|
||||
byte *greekToJis = convert.greekToJis;
|
||||
byte *extraToJis = convert.extraToJis;
|
||||
#else
|
||||
byte[] cjkToJis = JISConvert.Convert.cjkToJis;
|
||||
byte[] greekToJis = JISConvert.Convert.greekToJis;
|
||||
byte[] extraToJis = JISConvert.Convert.extraToJis;
|
||||
byte[] cjkToJis = convert.cjkToJis;
|
||||
byte[] greekToJis = convert.greekToJis;
|
||||
byte[] extraToJis = convert.extraToJis;
|
||||
#endif
|
||||
while(charCount > 0)
|
||||
{
|
||||
@@ -449,9 +453,9 @@ public unsafe class CP932 : MonoEncoding
|
||||
int length = 0;
|
||||
int byteval, value;
|
||||
#if __PNET__
|
||||
byte *table = JISConvert.Convert.jisx0208ToUnicode;
|
||||
byte *table = convert.jisx0208ToUnicode;
|
||||
#else
|
||||
byte[] table = JISConvert.Convert.jisx0208ToUnicode;
|
||||
byte[] table = convert.jisx0208ToUnicode;
|
||||
#endif
|
||||
while(byteCount > 0)
|
||||
{
|
||||
@@ -558,7 +562,7 @@ public unsafe class CP932 : MonoEncoding
|
||||
// Get a decoder that handles a rolling Shift-JIS state.
|
||||
public override Decoder GetDecoder()
|
||||
{
|
||||
return new CP932Decoder(JISConvert.Convert);
|
||||
return new CP932Decoder(convert);
|
||||
}
|
||||
|
||||
#if !ECMA_COMPAT
|
||||
@@ -835,7 +839,6 @@ public unsafe class CP932 : MonoEncoding
|
||||
|
||||
}; // class CP932
|
||||
|
||||
[Serializable]
|
||||
public class ENCshift_jis : CP932
|
||||
{
|
||||
public ENCshift_jis() : base() {}
|
||||
|
||||
@@ -13,26 +13,21 @@ using I18N.Common;
|
||||
|
||||
namespace I18N.CJK
|
||||
{
|
||||
[Serializable]
|
||||
internal class CP936 : DbcsEncoding
|
||||
{
|
||||
static DbcsConvert gb2312 = DbcsConvert.Gb2312;
|
||||
|
||||
// Magic number used by Windows for the Gb2312 code page.
|
||||
private const int GB2312_CODE_PAGE = 936;
|
||||
|
||||
// Constructor.
|
||||
public CP936() : base(GB2312_CODE_PAGE) {
|
||||
}
|
||||
|
||||
internal override DbcsConvert GetConvert ()
|
||||
{
|
||||
return DbcsConvert.Gb2312;
|
||||
}
|
||||
|
||||
|
||||
// Get the bytes that result from encoding a character buffer.
|
||||
public unsafe override int GetBytesImpl (char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
DbcsConvert gb2312 = GetConvert ();
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
#if NET_2_0
|
||||
@@ -64,46 +59,10 @@ namespace I18N.CJK
|
||||
return byteIndex - origIndex;
|
||||
}
|
||||
|
||||
// Get the characters that result from decoding a byte buffer.
|
||||
public override int GetCharCount (byte [] bytes, int index, int count)
|
||||
{
|
||||
if (bytes == null)
|
||||
throw new ArgumentNullException("bytes");
|
||||
if (index < 0 || index > bytes.Length)
|
||||
throw new ArgumentOutOfRangeException("index", Strings.GetString("ArgRange_Array"));
|
||||
if (count < 0 || index + count > bytes.Length)
|
||||
throw new ArgumentOutOfRangeException("count", Strings.GetString("ArgRange_Array"));
|
||||
|
||||
int lastByte = 0;
|
||||
int length = 0;
|
||||
while (count-- > 0) {
|
||||
int b = bytes [index++];
|
||||
if (lastByte == 0) {
|
||||
if (b <= 0x80 || b == 0xFF) { // ASCII
|
||||
length++;
|
||||
continue;
|
||||
} else {
|
||||
lastByte = b;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
length++;
|
||||
lastByte = 0;
|
||||
}
|
||||
|
||||
#if NET_2_0
|
||||
if (lastByte != 0)
|
||||
length++;
|
||||
#endif
|
||||
|
||||
return length;
|
||||
}
|
||||
|
||||
// Get the characters that result from decoding a byte buffer.
|
||||
public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
|
||||
char[] chars, int charIndex)
|
||||
{
|
||||
DbcsConvert gb2312 = GetConvert ();
|
||||
// A1 40 - FA FF
|
||||
base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
|
||||
int origIndex = charIndex;
|
||||
@@ -114,14 +73,15 @@ namespace I18N.CJK
|
||||
if (b <= 0x80 || b == 0xFF) { // ASCII
|
||||
chars[charIndex++] = (char)b;
|
||||
continue;
|
||||
} else if (b < 0x81 || b >= 0xFF) {
|
||||
continue;
|
||||
} else {
|
||||
lastByte = b;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
int ord = ((lastByte - 0x81) * 191 + b - 0x40) * 2;
|
||||
char c1 = (ord < 0 || ord + 1 >= gb2312.n2u.Length) ?
|
||||
'\0' : (char)(gb2312.n2u[ord] + gb2312.n2u[ord + 1] * 256);
|
||||
char c1 = (char)(gb2312.n2u[ord] + gb2312.n2u[ord + 1] * 256);
|
||||
if (c1 == 0)
|
||||
chars[charIndex++] = '?';
|
||||
else
|
||||
@@ -134,7 +94,7 @@ namespace I18N.CJK
|
||||
// Get a decoder that handles a rolling Gb2312 state.
|
||||
public override Decoder GetDecoder()
|
||||
{
|
||||
return new CP936Decoder(GetConvert ());
|
||||
return new CP936Decoder(gb2312);
|
||||
}
|
||||
|
||||
// Get the mail body name for this encoding.
|
||||
@@ -223,7 +183,6 @@ namespace I18N.CJK
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
internal class ENCgb2312 : CP936
|
||||
{
|
||||
public ENCgb2312(): base () {}
|
||||
|
||||
@@ -11,7 +11,6 @@ using I18N.Common;
|
||||
|
||||
namespace I18N.CJK
|
||||
{
|
||||
[Serializable]
|
||||
internal class CP949 : KoreanEncoding
|
||||
{
|
||||
// Magic number used by Windows for the UHC code page.
|
||||
@@ -55,7 +54,6 @@ namespace I18N.CJK
|
||||
*/
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
internal class CP51949 : KoreanEncoding
|
||||
{
|
||||
// Magic number used by Windows for the euc-kr code page.
|
||||
@@ -100,19 +98,14 @@ namespace I18N.CJK
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
internal class KoreanEncoding : DbcsEncoding
|
||||
{
|
||||
// Constructor.
|
||||
public KoreanEncoding (int codepage, bool useUHC) : base (codepage) {
|
||||
convert = KSConvert.Convert;
|
||||
this.useUHC = useUHC;
|
||||
}
|
||||
|
||||
internal override DbcsConvert GetConvert ()
|
||||
{
|
||||
return KSConvert.Convert;
|
||||
}
|
||||
|
||||
bool useUHC;
|
||||
|
||||
// Get the bytes that result from encoding a character buffer.
|
||||
@@ -121,7 +114,6 @@ namespace I18N.CJK
|
||||
{
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
DbcsConvert convert = GetConvert ();
|
||||
#if NET_2_0
|
||||
EncoderFallbackBuffer buffer = null;
|
||||
#endif
|
||||
@@ -155,7 +147,6 @@ namespace I18N.CJK
|
||||
public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
|
||||
char[] chars, int charIndex)
|
||||
{
|
||||
DbcsConvert convert = GetConvert ();
|
||||
base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
|
||||
int origIndex = charIndex;
|
||||
int lastByte = 0;
|
||||
@@ -227,7 +218,7 @@ namespace I18N.CJK
|
||||
// Get a decoder that handles a rolling UHC state.
|
||||
public override Decoder GetDecoder()
|
||||
{
|
||||
return new KoreanDecoder (GetConvert (), useUHC);
|
||||
return new KoreanDecoder (convert, useUHC);
|
||||
}
|
||||
|
||||
// Decoder that handles a rolling UHC state.
|
||||
@@ -312,13 +303,11 @@ namespace I18N.CJK
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
internal class ENCuhc : CP949
|
||||
{
|
||||
public ENCuhc() {}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
internal class ENCeuc_kr: CP51949
|
||||
{
|
||||
public ENCeuc_kr() {}
|
||||
|
||||
@@ -11,7 +11,6 @@ using I18N.Common;
|
||||
|
||||
namespace I18N.CJK
|
||||
{
|
||||
[Serializable]
|
||||
internal class CP950 : DbcsEncoding
|
||||
{
|
||||
// Magic number used by Windows for the Big5 code page.
|
||||
@@ -19,18 +18,13 @@ namespace I18N.CJK
|
||||
|
||||
// Constructor.
|
||||
public CP950() : base(BIG5_CODE_PAGE) {
|
||||
convert = Big5Convert.Convert;
|
||||
}
|
||||
|
||||
internal override DbcsConvert GetConvert ()
|
||||
{
|
||||
return Big5Convert.Convert;
|
||||
}
|
||||
|
||||
|
||||
// Get the bytes that result from encoding a character buffer.
|
||||
public unsafe override int GetBytesImpl (char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
DbcsConvert convert = GetConvert ();
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
#if NET_2_0
|
||||
@@ -66,7 +60,6 @@ namespace I18N.CJK
|
||||
public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
|
||||
char[] chars, int charIndex)
|
||||
{
|
||||
DbcsConvert convert = GetConvert ();
|
||||
// A1 40 - FA FF
|
||||
base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
|
||||
int origIndex = charIndex;
|
||||
@@ -98,7 +91,7 @@ namespace I18N.CJK
|
||||
// Get a decoder that handles a rolling Big5 state.
|
||||
public override Decoder GetDecoder()
|
||||
{
|
||||
return new CP950Decoder(GetConvert ());
|
||||
return new CP950Decoder(convert);
|
||||
}
|
||||
|
||||
// Get the mail body name for this encoding.
|
||||
@@ -171,7 +164,6 @@ namespace I18N.CJK
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
internal class ENCbig5 : CP950
|
||||
{
|
||||
public ENCbig5() {}
|
||||
|
||||
@@ -1,30 +1,3 @@
|
||||
2006-01-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* DbcsEncoding.cs CP950.cs CP932.cs CP936.cs CP51932.cs CP949.cs :
|
||||
Made all as really serializable. Removed references to DbcsConvert
|
||||
and added GetConvert() methods instead.
|
||||
|
||||
2006-01-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* DbcsEncoding.cs ISO2022JP.cs GB18030Encoding.cs CP950.cs
|
||||
CP932.cs CP936.cs CP51932.cs CP949.cs (All) :
|
||||
Marked as [Serializable].
|
||||
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP936.cs :
|
||||
Implement GetCharCount(); it is too costy to use GetChars()
|
||||
in GetCharCount(). Removed extra code in GetChars(). Check table
|
||||
index range before accessing it by index.
|
||||
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP51932.cs :
|
||||
In GetChars(), insufficient byte is not preserved.
|
||||
Under 1.x profile it is just discarded.
|
||||
Under 2.0 profile it is converted to \u30FB.
|
||||
Fixed GetCharCount() to match GetChars().
|
||||
|
||||
2006-01-13 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP932.cs : GetByteCount() returned insufficient count at PrivateUse
|
||||
|
||||
@@ -11,13 +11,12 @@ using I18N.Common;
|
||||
|
||||
namespace I18N.CJK
|
||||
{
|
||||
[Serializable]
|
||||
internal abstract class DbcsEncoding : MonoEncoding
|
||||
{
|
||||
internal DbcsConvert convert;
|
||||
|
||||
public DbcsEncoding(int codePage) : base(codePage) {}
|
||||
|
||||
internal abstract DbcsConvert GetConvert ();
|
||||
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public override int GetByteCount(char[] chars, int index, int count)
|
||||
{
|
||||
@@ -102,7 +101,7 @@ namespace I18N.CJK
|
||||
// Get a decoder that handles a rolling state.
|
||||
public override Decoder GetDecoder()
|
||||
{
|
||||
return new DbcsDecoder(GetConvert ());
|
||||
return new DbcsDecoder(convert);
|
||||
}
|
||||
|
||||
// Determine if this encoding can be displayed in a Web browser.
|
||||
|
||||
@@ -11,16 +11,13 @@ using I18N.Common;
|
||||
|
||||
namespace I18N.CJK
|
||||
{
|
||||
[Serializable]
|
||||
internal class ENCgb18030 : GB18030Encoding
|
||||
{
|
||||
public ENCgb18030 (): base () {}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class CP54936 : GB18030Encoding { }
|
||||
|
||||
[Serializable]
|
||||
public class GB18030Encoding : MonoEncoding
|
||||
{
|
||||
// Constructor.
|
||||
|
||||
@@ -7,7 +7,6 @@ namespace I18N.CJK
|
||||
// FIXME:
|
||||
// find out what is the difference between 50220, 50221 and 50222.
|
||||
|
||||
[Serializable]
|
||||
public class CP50220 : ISO2022JPEncoding
|
||||
{
|
||||
public CP50220 ()
|
||||
@@ -20,7 +19,6 @@ namespace I18N.CJK
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class CP50221 : ISO2022JPEncoding
|
||||
{
|
||||
public CP50221 ()
|
||||
@@ -33,7 +31,6 @@ namespace I18N.CJK
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class CP50222 : ISO2022JPEncoding
|
||||
{
|
||||
public CP50222 ()
|
||||
@@ -46,7 +43,6 @@ namespace I18N.CJK
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class ISO2022JPEncoding : MonoEncoding
|
||||
{
|
||||
static JISConvert convert = JISConvert.Convert;
|
||||
@@ -529,7 +525,6 @@ namespace I18N.CJK
|
||||
#endif
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_2022_jp : CP50220
|
||||
{
|
||||
public ENCiso_2022_jp () : base() {}
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* I18N.CJK.Test.cs : added test for bug #77238.
|
||||
|
||||
2006-01-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* I18N.CJK.Test.cs : added test for bug #77223, #77224 and #77222.
|
||||
|
||||
2005-12-06 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* I18N.CJK.Test.cs : w00t, Now all test are working, including
|
||||
|
||||
@@ -148,7 +148,7 @@ namespace MonoTests.I18N.CJK
|
||||
AssertDecode ("Test/texts/japanese-utf8.txt", "Test/texts/japanese-51932.txt", 51932);
|
||||
}
|
||||
|
||||
// ISO-2022-JP
|
||||
// ISI-2022-JP
|
||||
|
||||
[Test]
|
||||
public void CP50220_Encode ()
|
||||
@@ -192,50 +192,6 @@ namespace MonoTests.I18N.CJK
|
||||
AssertDecode ("Test/texts/japanese-utf8.txt", "Test/texts/japanese-50222.txt", 50222);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug77723 ()
|
||||
{
|
||||
Encoding e = Encoding.GetEncoding (51932);
|
||||
for (int i = 0; i < 0x10000; i++)
|
||||
e.GetBytes (new char [] { (char)i });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug77224 ()
|
||||
{
|
||||
Encoding e = Encoding.GetEncoding (932);
|
||||
for (int i = 0; i < 0x10000; i++)
|
||||
e.GetBytes (new char [] {(char) i});
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug77222 ()
|
||||
{
|
||||
Encoding e = Encoding.GetEncoding (51932);
|
||||
byte [] bytes = new byte [2];
|
||||
for (int i0 = 0; i0 < 0x100; i0++) {
|
||||
bytes [0] = (byte) i0;
|
||||
for (int i1 = 0; i1 < 0x100; i1++) {
|
||||
bytes [1] = (byte) i1;
|
||||
e.GetChars (bytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug77238 ()
|
||||
{
|
||||
Encoding e = Encoding.GetEncoding(936);
|
||||
byte [] bytes = new byte [2];
|
||||
for (int i0 = 0; i0 < 0x100; i0++) {
|
||||
bytes [0] = (byte) i0;
|
||||
for (int i1 = 0; i1 < 0x100; i1++) {
|
||||
bytes [1] = (byte) i1;
|
||||
e.GetChars (bytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Korean
|
||||
|
||||
@@ -34,7 +34,6 @@ using System.Text;
|
||||
// subclasses providing implementations of the "ToBytes" methods to perform
|
||||
// the char->byte conversion.
|
||||
|
||||
[Serializable]
|
||||
public abstract class ByteEncoding : MonoEncoding
|
||||
{
|
||||
// Internal state.
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2006-01-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* MonoEncoding.cs, ByteEncoding.cs :
|
||||
Marked as [Serializable].
|
||||
|
||||
2005-12-01 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* MonoEncoding.cs : new file, which is going to be used as the
|
||||
|
||||
@@ -12,7 +12,7 @@ using System.Text;
|
||||
|
||||
namespace I18N.Common
|
||||
{
|
||||
[Serializable]
|
||||
|
||||
public abstract class MonoEncoding : Encoding
|
||||
{
|
||||
public MonoEncoding (int codePage)
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1254 : ByteEncoding
|
||||
{
|
||||
public CP1254()
|
||||
@@ -404,7 +403,6 @@ public class CP1254 : ByteEncoding
|
||||
|
||||
}; // class CP1254
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1254 : CP1254
|
||||
{
|
||||
public ENCwindows_1254() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1255 : ByteEncoding
|
||||
{
|
||||
public CP1255()
|
||||
@@ -398,7 +397,6 @@ public class CP1255 : ByteEncoding
|
||||
|
||||
}; // class CP1255
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1255 : CP1255
|
||||
{
|
||||
public ENCwindows_1255() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1256 : ByteEncoding
|
||||
{
|
||||
public CP1256()
|
||||
@@ -776,7 +775,6 @@ public class CP1256 : ByteEncoding
|
||||
|
||||
}; // class CP1256
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1256 : CP1256
|
||||
{
|
||||
public ENCwindows_1256() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28596 : ByteEncoding
|
||||
{
|
||||
public CP28596()
|
||||
@@ -550,7 +549,6 @@ public class CP28596 : ByteEncoding
|
||||
|
||||
}; // class CP28596
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_6 : CP28596
|
||||
{
|
||||
public ENCiso_8859_6() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28598 : ByteEncoding
|
||||
{
|
||||
public CP28598()
|
||||
@@ -266,7 +265,6 @@ public class CP28598 : ByteEncoding
|
||||
|
||||
}; // class CP28598
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_8 : CP28598
|
||||
{
|
||||
public ENCiso_8859_8() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28599 : ByteEncoding
|
||||
{
|
||||
public CP28599()
|
||||
@@ -246,7 +245,6 @@ public class CP28599 : ByteEncoding
|
||||
|
||||
}; // class CP28599
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_9 : CP28599
|
||||
{
|
||||
public ENCiso_8859_9() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP38598 : ByteEncoding
|
||||
{
|
||||
public CP38598()
|
||||
@@ -266,7 +265,6 @@ public class CP38598 : ByteEncoding
|
||||
|
||||
}; // class CP38598
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_38598 : CP38598
|
||||
{
|
||||
public ENCwindows_38598() : base() {}
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
2006-01-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP1254.cs CP1255.cs CP28596.cs CP1256.cs CP28598.cs CP38598.cs
|
||||
CP28599.cs (All) :
|
||||
Marked as [Serializable].
|
||||
|
||||
2005-12-01 Atsushi Enomoto <[email protected]>
|
||||
|
||||
(this is the first ChangeLog entry.)
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1251 : ByteEncoding
|
||||
{
|
||||
public CP1251()
|
||||
@@ -408,7 +407,6 @@ public class CP1251 : ByteEncoding
|
||||
|
||||
}; // class CP1251
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1251 : CP1251
|
||||
{
|
||||
public ENCwindows_1251() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1257 : ByteEncoding
|
||||
{
|
||||
public CP1257()
|
||||
@@ -400,7 +399,6 @@ public class CP1257 : ByteEncoding
|
||||
|
||||
}; // class CP1257
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1257 : CP1257
|
||||
{
|
||||
public ENCwindows_1257() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1258 : ByteEncoding
|
||||
{
|
||||
public CP1258()
|
||||
@@ -404,7 +403,6 @@ public class CP1258 : ByteEncoding
|
||||
|
||||
}; // class CP1258
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1258 : CP1258
|
||||
{
|
||||
public ENCwindows_1258() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20866 : ByteEncoding
|
||||
{
|
||||
public CP20866()
|
||||
@@ -434,7 +433,6 @@ public class CP20866 : ByteEncoding
|
||||
|
||||
}; // class CP20866
|
||||
|
||||
[Serializable]
|
||||
public class ENCkoi8_r : CP20866
|
||||
{
|
||||
public ENCkoi8_r() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP21866 : ByteEncoding
|
||||
{
|
||||
public CP21866()
|
||||
@@ -434,7 +433,6 @@ public class CP21866 : ByteEncoding
|
||||
|
||||
}; // class CP21866
|
||||
|
||||
[Serializable]
|
||||
public class ENCkoi8_u : CP21866
|
||||
{
|
||||
public ENCkoi8_u() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28594 : ByteEncoding
|
||||
{
|
||||
public CP28594()
|
||||
@@ -338,7 +337,6 @@ public class CP28594 : ByteEncoding
|
||||
|
||||
}; // class CP28594
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_4 : CP28594
|
||||
{
|
||||
public ENCiso_8859_4() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28595 : ByteEncoding
|
||||
{
|
||||
public CP28595()
|
||||
@@ -350,7 +349,6 @@ public class CP28595 : ByteEncoding
|
||||
|
||||
}; // class CP28595
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_5 : CP28595
|
||||
{
|
||||
public ENCiso_8859_5() : base() {}
|
||||
|
||||
@@ -39,7 +39,6 @@ using I18N.Common;
|
||||
// are a shifted version of the Unicode character set, starting
|
||||
// at a fixed offset.
|
||||
|
||||
[Serializable]
|
||||
public abstract class ISCIIEncoding : MonoEncoding
|
||||
{
|
||||
// Internal state.
|
||||
@@ -360,35 +359,30 @@ public abstract class ISCIIEncoding : MonoEncoding
|
||||
|
||||
// Define the ISCII code pages as subclasses of "ISCIIEncoding".
|
||||
|
||||
[Serializable]
|
||||
public class CP57002 : ISCIIEncoding
|
||||
{
|
||||
public CP57002() : base(57002, 0x0900, "ISCII Devanagari", "x-iscii-de") {}
|
||||
|
||||
}; // class CP57002
|
||||
|
||||
[Serializable]
|
||||
public class CP57003 : ISCIIEncoding
|
||||
{
|
||||
public CP57003() : base(57003, 0x0980, "ISCII Bengali", "x-iscii-be") {}
|
||||
|
||||
}; // class CP57003
|
||||
|
||||
[Serializable]
|
||||
public class CP57004 : ISCIIEncoding
|
||||
{
|
||||
public CP57004() : base(57004, 0x0B80, "ISCII Tamil", "x-iscii-ta") {}
|
||||
|
||||
}; // class CP57004
|
||||
|
||||
[Serializable]
|
||||
public class CP57005 : ISCIIEncoding
|
||||
{
|
||||
public CP57005() : base(57005, 0x0B80, "ISCII Telugu", "x-iscii-te") {}
|
||||
|
||||
}; // class CP57005
|
||||
|
||||
[Serializable]
|
||||
public class CP57006 : ISCIIEncoding
|
||||
{
|
||||
// Note: Unicode has a "Sinhala" page, but no "Assamese" page.
|
||||
@@ -398,35 +392,30 @@ public class CP57006 : ISCIIEncoding
|
||||
|
||||
}; // class CP57006
|
||||
|
||||
[Serializable]
|
||||
public class CP57007 : ISCIIEncoding
|
||||
{
|
||||
public CP57007() : base(57007, 0x0B00, "ISCII Oriya", "x-iscii-or") {}
|
||||
|
||||
}; // class CP57007
|
||||
|
||||
[Serializable]
|
||||
public class CP57008 : ISCIIEncoding
|
||||
{
|
||||
public CP57008() : base(57008, 0x0C80, "ISCII Kannada", "x-iscii-ka") {}
|
||||
|
||||
}; // class CP57008
|
||||
|
||||
[Serializable]
|
||||
public class CP57009 : ISCIIEncoding
|
||||
{
|
||||
public CP57009() : base(57009, 0x0D00, "ISCII Malayalam", "x-iscii-ma") {}
|
||||
|
||||
}; // class CP57009
|
||||
|
||||
[Serializable]
|
||||
public class CP57010 : ISCIIEncoding
|
||||
{
|
||||
public CP57010() : base(57010, 0x0A80, "ISCII Gujarati", "x-iscii-gu") {}
|
||||
|
||||
}; // class CP57010
|
||||
|
||||
[Serializable]
|
||||
public class CP57011 : ISCIIEncoding
|
||||
{
|
||||
// Note: Unicode has a "Gurmukhi" page, but no "Punjabi" page.
|
||||
@@ -440,70 +429,60 @@ public class CP57011 : ISCIIEncoding
|
||||
|
||||
// Define the web encoding name aliases for the above code pages.
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_de : CP57002
|
||||
{
|
||||
public ENCx_iscii_de() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_de
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_be : CP57003
|
||||
{
|
||||
public ENCx_iscii_be() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_be
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_ta : CP57004
|
||||
{
|
||||
public ENCx_iscii_ta() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_ta
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_te : CP57005
|
||||
{
|
||||
public ENCx_iscii_te() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_te
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_as : CP57006
|
||||
{
|
||||
public ENCx_iscii_as() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_as
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_or : CP57007
|
||||
{
|
||||
public ENCx_iscii_or() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_or
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_ka : CP57008
|
||||
{
|
||||
public ENCx_iscii_ka() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_ka
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_ma : CP57009
|
||||
{
|
||||
public ENCx_iscii_ma() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_ma
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_gu : CP57010
|
||||
{
|
||||
public ENCx_iscii_gu() : base() {}
|
||||
|
||||
}; // class ENCx_iscii_gu
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_iscii_pa : CP57011
|
||||
{
|
||||
public ENCx_iscii_pa() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP874 : ByteEncoding
|
||||
{
|
||||
public CP874()
|
||||
@@ -542,7 +541,6 @@ public class CP874 : ByteEncoding
|
||||
|
||||
}; // class CP874
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_874 : CP874
|
||||
{
|
||||
public ENCwindows_874() : base() {}
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
2006-01-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP1251.cs CP28594.cs CP28595.cs CP1257.cs CP1258.cs CP57002.cs
|
||||
CP874.cs CP20866.cs CP21866.cs (All) :
|
||||
Marked as [Serializable].
|
||||
|
||||
2005-12-01 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP57002.cs : Now its base class is MonoEncoding, and implemented
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1026 : ByteEncoding
|
||||
{
|
||||
public CP1026()
|
||||
@@ -902,7 +901,6 @@ public class CP1026 : ByteEncoding
|
||||
|
||||
}; // class CP1026
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1026 : CP1026
|
||||
{
|
||||
public ENCibm1026() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1047 : ByteEncoding
|
||||
{
|
||||
public CP1047()
|
||||
@@ -902,7 +901,6 @@ public class CP1047 : ByteEncoding
|
||||
|
||||
}; // class CP1047
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1047 : CP1047
|
||||
{
|
||||
public ENCibm1047() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1140 : ByteEncoding
|
||||
{
|
||||
public CP1140()
|
||||
@@ -902,7 +901,6 @@ public class CP1140 : ByteEncoding
|
||||
|
||||
}; // class CP1140
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm01140 : CP1140
|
||||
{
|
||||
public ENCibm01140() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1141 : ByteEncoding
|
||||
{
|
||||
public CP1141()
|
||||
@@ -902,7 +901,6 @@ public class CP1141 : ByteEncoding
|
||||
|
||||
}; // class CP1141
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm01141 : CP1141
|
||||
{
|
||||
public ENCibm01141() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1142 : ByteEncoding
|
||||
{
|
||||
public CP1142()
|
||||
@@ -902,7 +901,6 @@ public class CP1142 : ByteEncoding
|
||||
|
||||
}; // class CP1142
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm01142 : CP1142
|
||||
{
|
||||
public ENCibm01142() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1143 : ByteEncoding
|
||||
{
|
||||
public CP1143()
|
||||
@@ -902,7 +901,6 @@ public class CP1143 : ByteEncoding
|
||||
|
||||
}; // class CP1143
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm01143 : CP1143
|
||||
{
|
||||
public ENCibm01143() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1144 : ByteEncoding
|
||||
{
|
||||
public CP1144()
|
||||
@@ -902,7 +901,6 @@ public class CP1144 : ByteEncoding
|
||||
|
||||
}; // class CP1144
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1144 : CP1144
|
||||
{
|
||||
public ENCibm1144() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1145 : ByteEncoding
|
||||
{
|
||||
public CP1145()
|
||||
@@ -902,7 +901,6 @@ public class CP1145 : ByteEncoding
|
||||
|
||||
}; // class CP1145
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1145 : CP1145
|
||||
{
|
||||
public ENCibm1145() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1146 : ByteEncoding
|
||||
{
|
||||
public CP1146()
|
||||
@@ -902,7 +901,6 @@ public class CP1146 : ByteEncoding
|
||||
|
||||
}; // class CP1146
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1146 : CP1146
|
||||
{
|
||||
public ENCibm1146() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1147 : ByteEncoding
|
||||
{
|
||||
public CP1147()
|
||||
@@ -902,7 +901,6 @@ public class CP1147 : ByteEncoding
|
||||
|
||||
}; // class CP1147
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1147 : CP1147
|
||||
{
|
||||
public ENCibm1147() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1148 : ByteEncoding
|
||||
{
|
||||
public CP1148()
|
||||
@@ -902,7 +901,6 @@ public class CP1148 : ByteEncoding
|
||||
|
||||
}; // class CP1148
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1148 : CP1148
|
||||
{
|
||||
public ENCibm1148() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1149 : ByteEncoding
|
||||
{
|
||||
public CP1149()
|
||||
@@ -902,7 +901,6 @@ public class CP1149 : ByteEncoding
|
||||
|
||||
}; // class CP1149
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1149 : CP1149
|
||||
{
|
||||
public ENCibm1149() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20273 : ByteEncoding
|
||||
{
|
||||
public CP20273()
|
||||
@@ -904,7 +903,6 @@ public class CP20273 : ByteEncoding
|
||||
|
||||
}; // class CP20273
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm273 : CP20273
|
||||
{
|
||||
public ENCibm273() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20277 : ByteEncoding
|
||||
{
|
||||
public CP20277()
|
||||
@@ -904,7 +903,6 @@ public class CP20277 : ByteEncoding
|
||||
|
||||
}; // class CP20277
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm277 : CP20277
|
||||
{
|
||||
public ENCibm277() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20278 : ByteEncoding
|
||||
{
|
||||
public CP20278()
|
||||
@@ -904,7 +903,6 @@ public class CP20278 : ByteEncoding
|
||||
|
||||
}; // class CP20278
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm278 : CP20278
|
||||
{
|
||||
public ENCibm278() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20280 : ByteEncoding
|
||||
{
|
||||
public CP20280()
|
||||
@@ -904,7 +903,6 @@ public class CP20280 : ByteEncoding
|
||||
|
||||
}; // class CP20280
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm280 : CP20280
|
||||
{
|
||||
public ENCibm280() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20284 : ByteEncoding
|
||||
{
|
||||
public CP20284()
|
||||
@@ -904,7 +903,6 @@ public class CP20284 : ByteEncoding
|
||||
|
||||
}; // class CP20284
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm284 : CP20284
|
||||
{
|
||||
public ENCibm284() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20285 : ByteEncoding
|
||||
{
|
||||
public CP20285()
|
||||
@@ -904,7 +903,6 @@ public class CP20285 : ByteEncoding
|
||||
|
||||
}; // class CP20285
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm285 : CP20285
|
||||
{
|
||||
public ENCibm285() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20290 : ByteEncoding
|
||||
{
|
||||
public CP20290()
|
||||
@@ -872,7 +871,6 @@ public class CP20290 : ByteEncoding
|
||||
|
||||
}; // class CP20290
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm290 : CP20290
|
||||
{
|
||||
public ENCibm290() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20297 : ByteEncoding
|
||||
{
|
||||
public CP20297()
|
||||
@@ -904,7 +903,6 @@ public class CP20297 : ByteEncoding
|
||||
|
||||
}; // class CP20297
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm297 : CP20297
|
||||
{
|
||||
public ENCibm297() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20420 : ByteEncoding
|
||||
{
|
||||
public CP20420()
|
||||
@@ -1080,7 +1079,6 @@ public class CP20420 : ByteEncoding
|
||||
|
||||
}; // class CP20420
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm420 : CP20420
|
||||
{
|
||||
public ENCibm420() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20424 : ByteEncoding
|
||||
{
|
||||
public CP20424()
|
||||
@@ -836,7 +835,6 @@ public class CP20424 : ByteEncoding
|
||||
|
||||
}; // class CP20424
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm424 : CP20424
|
||||
{
|
||||
public ENCibm424() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP20871 : ByteEncoding
|
||||
{
|
||||
public CP20871()
|
||||
@@ -904,7 +903,6 @@ public class CP20871 : ByteEncoding
|
||||
|
||||
}; // class CP20871
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm871 : CP20871
|
||||
{
|
||||
public ENCibm871() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP21025 : ByteEncoding
|
||||
{
|
||||
public CP21025()
|
||||
@@ -924,7 +923,6 @@ public class CP21025 : ByteEncoding
|
||||
|
||||
}; // class CP21025
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm1025 : CP21025
|
||||
{
|
||||
public ENCibm1025() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP37 : ByteEncoding
|
||||
{
|
||||
public CP37()
|
||||
@@ -904,7 +903,6 @@ public class CP37 : ByteEncoding
|
||||
|
||||
}; // class CP37
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm037 : CP37
|
||||
{
|
||||
public ENCibm037() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP500 : ByteEncoding
|
||||
{
|
||||
public CP500()
|
||||
@@ -904,7 +903,6 @@ public class CP500 : ByteEncoding
|
||||
|
||||
}; // class CP500
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm500 : CP500
|
||||
{
|
||||
public ENCibm500() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP708 : ByteEncoding
|
||||
{
|
||||
public CP708()
|
||||
@@ -550,7 +549,6 @@ public class CP708 : ByteEncoding
|
||||
|
||||
}; // class CP708
|
||||
|
||||
[Serializable]
|
||||
public class ENCasmo_708 : CP708
|
||||
{
|
||||
public ENCasmo_708() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP852 : ByteEncoding
|
||||
{
|
||||
public CP852()
|
||||
@@ -684,7 +683,6 @@ public class CP852 : ByteEncoding
|
||||
|
||||
}; // class CP852
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm852 : CP852
|
||||
{
|
||||
public ENCibm852() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP855 : ByteEncoding
|
||||
{
|
||||
public CP855()
|
||||
@@ -684,7 +683,6 @@ public class CP855 : ByteEncoding
|
||||
|
||||
}; // class CP855
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm855 : CP855
|
||||
{
|
||||
public ENCibm855() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP857 : ByteEncoding
|
||||
{
|
||||
public CP857()
|
||||
@@ -678,7 +677,6 @@ public class CP857 : ByteEncoding
|
||||
|
||||
}; // class CP857
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm857 : CP857
|
||||
{
|
||||
public ENCibm857() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP858 : ByteEncoding
|
||||
{
|
||||
public CP858()
|
||||
@@ -684,7 +683,6 @@ public class CP858 : ByteEncoding
|
||||
|
||||
}; // class CP858
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm00858 : CP858
|
||||
{
|
||||
public ENCibm00858() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP862 : ByteEncoding
|
||||
{
|
||||
public CP862()
|
||||
@@ -690,7 +689,6 @@ public class CP862 : ByteEncoding
|
||||
|
||||
}; // class CP862
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm862 : CP862
|
||||
{
|
||||
public ENCibm862() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP864 : ByteEncoding
|
||||
{
|
||||
public CP864()
|
||||
@@ -866,7 +865,6 @@ public class CP864 : ByteEncoding
|
||||
|
||||
}; // class CP864
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm864 : CP864
|
||||
{
|
||||
public ENCibm864() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP866 : ByteEncoding
|
||||
{
|
||||
public CP866()
|
||||
@@ -694,7 +693,6 @@ public class CP866 : ByteEncoding
|
||||
|
||||
}; // class CP866
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm866 : CP866
|
||||
{
|
||||
public ENCibm866() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP869 : ByteEncoding
|
||||
{
|
||||
public CP869()
|
||||
@@ -686,7 +685,6 @@ public class CP869 : ByteEncoding
|
||||
|
||||
}; // class CP869
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm869 : CP869
|
||||
{
|
||||
public ENCibm869() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP870 : ByteEncoding
|
||||
{
|
||||
public CP870()
|
||||
@@ -902,7 +901,6 @@ public class CP870 : ByteEncoding
|
||||
|
||||
}; // class CP870
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm870 : CP870
|
||||
{
|
||||
public ENCibm870() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP875 : ByteEncoding
|
||||
{
|
||||
public CP875()
|
||||
@@ -920,7 +919,6 @@ public class CP875 : ByteEncoding
|
||||
|
||||
}; // class CP875
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm875 : CP875
|
||||
{
|
||||
public ENCibm875() : base() {}
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
2006-01-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CP1145.cs CP1149.cs CP20420.cs CP20424.cs CP708.cs CP855.cs
|
||||
CP875.cs CP1140.cs CP869.cs CP1144.cs CP1047.cs CP1148.cs
|
||||
CP21025.cs CP870.cs CP20285.cs CP864.cs CP858.cs CP1143.cs
|
||||
CP1026.cs CP37.cs CP1147.cs CP500.cs CP20280.cs CP20290.cs
|
||||
CP20284.cs CP20278.cs CP857.cs CP1142.cs CP1146.cs CP20273.cs
|
||||
CP852.cs CP862.cs CP20277.cs CP20871.cs CP866.cs CP20297.cs
|
||||
CP1141.cs (All) :
|
||||
Marked as [Serializable].
|
||||
|
||||
2005-12-01 Atsushi Enomoto <[email protected]>
|
||||
|
||||
(this is the first ChangeLog entry.)
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP10000 : ByteEncoding
|
||||
{
|
||||
public CP10000()
|
||||
@@ -410,7 +409,6 @@ public class CP10000 : ByteEncoding
|
||||
|
||||
}; // class CP10000
|
||||
|
||||
[Serializable]
|
||||
public class ENCmacintosh : CP10000
|
||||
{
|
||||
public ENCmacintosh() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP10079 : ByteEncoding
|
||||
{
|
||||
public CP10079()
|
||||
@@ -391,7 +390,6 @@ public class CP10079 : ByteEncoding
|
||||
|
||||
}; // class CP10079
|
||||
|
||||
[Serializable]
|
||||
public class ENCx_mac_icelandic : CP10079
|
||||
{
|
||||
public ENCx_mac_icelandic() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1250 : ByteEncoding
|
||||
{
|
||||
public CP1250()
|
||||
@@ -404,7 +403,6 @@ public class CP1250 : ByteEncoding
|
||||
|
||||
}; // class CP1250
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1250 : CP1250
|
||||
{
|
||||
public ENCwindows_1250() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1252 : ByteEncoding
|
||||
{
|
||||
public CP1252()
|
||||
@@ -404,7 +403,6 @@ public class CP1252 : ByteEncoding
|
||||
|
||||
}; // class CP1252
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1252 : CP1252
|
||||
{
|
||||
public ENCwindows_1252() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP1253 : ByteEncoding
|
||||
{
|
||||
public CP1253()
|
||||
@@ -410,7 +409,6 @@ public class CP1253 : ByteEncoding
|
||||
|
||||
}; // class CP1253
|
||||
|
||||
[Serializable]
|
||||
public class ENCwindows_1253 : CP1253
|
||||
{
|
||||
public ENCwindows_1253() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28592 : ByteEncoding
|
||||
{
|
||||
public CP28592()
|
||||
@@ -476,7 +475,6 @@ public class CP28592 : ByteEncoding
|
||||
|
||||
}; // class CP28592
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_2 : CP28592
|
||||
{
|
||||
public ENCiso_8859_2() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28593 : ByteEncoding
|
||||
{
|
||||
public CP28593()
|
||||
@@ -324,7 +323,6 @@ public class CP28593 : ByteEncoding
|
||||
|
||||
}; // class CP28593
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_3 : CP28593
|
||||
{
|
||||
public ENCiso_8859_3() : base() {}
|
||||
|
||||
@@ -31,7 +31,6 @@ using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP28597 : ByteEncoding
|
||||
{
|
||||
public CP28597()
|
||||
@@ -344,7 +343,6 @@ public class CP28597 : ByteEncoding
|
||||
|
||||
}; // class CP28597
|
||||
|
||||
[Serializable]
|
||||
public class ENCiso_8859_7 : CP28597
|
||||
{
|
||||
public ENCiso_8859_7() : base() {}
|
||||
|
||||
Loaded 100 of 424 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user