Compare commits

...
195 Commits
Author SHA1 Message Date
Chris Toshok a17f894b66 merge up to r150220 from branch 2-6
svn path=/branches/moon/moon-2-0/mono/; revision=150389
2010-01-28 19:05:59 +00:00
Chris Toshok 7c591aef69 merge up to r150220 from branch 2-6
svn path=/branches/moon/moon-2-0/mcs/; revision=150388
2010-01-28 19:03:36 +00:00
Sebastien Pouliot 70ffc535d0 2010-01-26 Sebastien Pouliot <[email protected]>
* DataContractJsonSerializer_2_1.cs: Don't hide [Field|Method]
	AccessException inside a SerializationException but in a 
	SecurityException.
	[Backport r150219]


svn path=/branches/mono-2-6/mcs/; revision=150220
2010-01-26 18:33:30 +00:00
Sebastien Pouliot 875517d8cf backport r150214
svn path=/branches/mono-2-6/mcs/; revision=150215
2010-01-26 16:27:26 +00:00
Marek Safar 7bbd05b8d0 2010-01-26 Marek Safar <[email protected]>
A fix for bug #573329
	* eval.cs: Don't disable error reporting completely on silent mode.


svn path=/branches/mono-2-6/mcs/; revision=150204
2010-01-26 09:55:57 +00:00
Sebastien Pouliot be51c5ab18 2010-01-25 Sebastien Pouliot <[email protected]>
* net_2_1_raw_System.ServiceModel.Web.dll.sources: Use custom
	version of DataContractJsonSerializer for Moonlight
	[Backport r150153]


svn path=/branches/mono-2-6/mcs/; revision=150154
2010-01-25 21:03:12 +00:00
Sebastien Pouliot d55de3bf85 2010-01-25 Sebastien Pouliot <[email protected]>
* DataContractJsonSerializerTest.cs: Add non-working test cases
	for null-string, known types and handling floating point special
	values
	[Backport r150141]


svn path=/branches/mono-2-6/mcs/; revision=150152
2010-01-25 21:01:08 +00:00
Sebastien Pouliot 5dd48513d4 2010-01-25 Sebastien Pouliot <[email protected]>
* DataContractJsonSerializer_2_1.cs: New. Simpler version for 
	Moonlight since it does not inherit from the same base type nor
	does it overrides any base methods.
	[Backport r150149]


svn path=/branches/mono-2-6/mcs/; revision=150150
2010-01-25 20:58:39 +00:00
Sebastien Pouliot 1169b69aac 2010-01-25 Sebastien Pouliot <[email protected]>
* AssemblyInfo.cs: Fix attributes for Moonlight
	[Backport r150147]


svn path=/branches/mono-2-6/mcs/; revision=150148
2010-01-25 20:56:45 +00:00
Sebastien Pouliot 97c6f8c4c8 In .:
2010-01-25  Sebastien Pouliot  <[email protected]>

	* System.Net.dll.sources: Add UdpAnySourceMulticastClient and
	UdpSingleSourceMulticastClient stubs (with some validations)
	for SL4 (required to compile tests)
	[Backport r150127]

In System.Net:
2010-01-25  Sebastien Pouliot  <[email protected]>

	* UdpAnySourceMulticastClient.cs: New. Stub for SL4
	* UdpSingleSourceMulticastClient.cs: New. Stub for SL4
	[Backport r150127]


svn path=/branches/mono-2-6/mcs/; revision=150128
2010-01-25 13:22:36 +00:00
Zoltan Varga 3b16547b98 2010-01-25 Zoltan Varga <[email protected]>
* icall.c (ves_icall_System_Array_SetValueImpl): Handle nullable types correctly.
	Fixes #573322.

svn path=/branches/mono-2-6/mono/; revision=150125
2010-01-25 12:47:05 +00:00
Zoltan Varga 25ca9fdef7 2010-01-06 Atsushi Enomoto <[email protected]>
* culture-info-table.h : regenerated.

svn path=/branches/mono-2-6/mono/; revision=150118
2010-01-25 12:02:20 +00:00
Zoltan Varga 1cee1671e0 2010-01-06 Atsushi Enomoto <[email protected]>
* Driver.cs : support FirstDayOfWeek. Fixed bug #567944.
	  Patch by Jose Antonio Sanchez Lazaro.

svn path=/branches/mono-2-6/mono/; revision=150117
2010-01-25 12:02:02 +00:00
Atsushi Eno a8db1a887e backport r150102.
svn path=/branches/mono-2-6/mcs/; revision=150106
2010-01-25 05:36:55 +00:00
Atsushi Eno 910a3be886 backport r150100.
svn path=/branches/mono-2-6/mcs/; revision=150101
2010-01-25 03:40:20 +00:00
Atsushi Eno 1a77eba231 backport r150041.
svn path=/branches/mono-2-6/mcs/; revision=150042
2010-01-22 06:20:41 +00:00
Sebastien Pouliot 86a0bbefd9 2010-01-21 Sebastien Pouliot <[email protected]>
* SocketAsyncEventArgs.cs: Apply Gendarme's ProtectCallToEventDelegatesRule
	[Backport r150033]


svn path=/branches/mono-2-6/mcs/; revision=150034
2010-01-22 01:51:26 +00:00
Carlos Alberto Cortez 0e1ca66be7 2010-01-21 Carlos Alberto Cortez <[email protected]>
* IPEndPoint.cs: When throwing an ArgumentException in Create()
	because of a mismatch in the address family, use a more informative
	message. Patch by Juho Vähä-Herttu<[email protected]>.
	Fixes #505105.


svn path=/branches/mono-2-6/mcs/; revision=150032
2010-01-22 01:16:21 +00:00
Carlos Alberto Cortez 6034c2d32b 2010-01-21 Carlos Alberto Cortez <[email protected]>
* ComboBox.cs: When the normal drop down window is closed, make sure
	that the auto complete list -if any- is closed as well, instead of
	stay open without need.


svn path=/branches/mono-2-6/mcs/; revision=150029
2010-01-21 23:25:18 +00:00
Carlos Alberto Cortez 749f368ea8 * TextBox.cs: When showing the autocomplete listbox, make sure it's on
top, by calling the raw XplatUI.SetZOrder for it, since we can't
 	properly call BringToFront on it as it is parentless. This fixes an
 	issue when using this feature with ComboBox's own parentless listbox.
 	Fixes the remaining bits of #489339.

2010-01-21  Carlos Alberto Cortez <[email protected]>


svn path=/branches/mono-2-6/mcs/; revision=150027
2010-01-21 22:50:43 +00:00
Carlos Alberto Cortez 026da78b76 * XplatUI.cs:
* XplatUIDriver:
	* XplatUICarbon:
 	* XplatUIWin32:
 	* XplatUIX11.cs: 
 	* XplatUIStructs: Implement support for different kind of audible
 	alerts in Windows, and update the requiered classes.
 	* MessageBox.cs: 
 	* TextBoxBase.cs: Update calls to XplatUI.AudibleAlert.
 	Fixes #473725.

2010-01-21  Carlos Alberto Cortez <[email protected]>


svn path=/branches/mono-2-6/mcs/; revision=150024
2010-01-21 22:22:00 +00:00
Carlos Alberto Cortez c512240f2a * ComboBox.cs: When use manually setting DropDownHeight, ignore the
MaxDropDownHeight property - also rename our field 'count' to
	'visible_items_count' to avoid confusion as much as possible.
	Fixes an issue with several items, showing an incorrect layout.

2010-01-21  Carlos Alberto Cortez <[email protected]>


svn path=/branches/mono-2-6/mcs/; revision=150021
2010-01-21 22:06:49 +00:00
Carlos Alberto Cortez 2f49fef718 2010-01-21 Carlos Alberto Cortez <[email protected]>
* RichTextBoxTest.cs: New test for the Modified property.


svn path=/branches/mono-2-6/mcs/; revision=150019
2010-01-21 21:50:19 +00:00
Carlos Alberto Cortez a517a0c465 2010-01-21 Carlos Alberto Cortez <[email protected]>
* RichTextBox.cs: SelectedText should set Modified to true. Observe
	that this is happening just here, not for the Text property, and
	neither for the TextBoxBase impl.
	Fixes #569950.


svn path=/branches/mono-2-6/mcs/; revision=150017
2010-01-21 21:47:49 +00:00
Zoltan Varga bd0b130116 2010-01-21 Zoltan Varga <[email protected]>
* exceptions-amd64.c (mono_arch_notify_pending_exc): Avoid a crash if the
	thread has not fully started yet.

svn path=/branches/mono-2-6/mono/; revision=150014
2010-01-21 21:28:09 +00:00
Rodrigo Kumpera a1bda8ea92 In metadata:
* reflection.c (typebuilder_setup_fields): Pretend field setup already
	happened before starting to encode the actual fields. This avoid ciclic
	dependencies and eventual crashes.

	Fixes #572660.

	Backport of r150008.

2010-01-21  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=150011
2010-01-21 20:22:40 +00:00
Sebastien Pouliot 556c641fbb In Test/System.Net:
2010-01-21  Sebastien Pouliot  <[email protected]>

	* CookieContainerTest.cs: Additional test cases from Tom Philpot
	[Backport r149976 + NET_1_1 fixes]

In System.Net:
2010-01-21  Sebastien Pouliot  <[email protected]>

	* CookieContainer.cs: Fix to cloning and expiration. Patch
	by Tom Philpot <[email protected]>
	[Backport r149976 + NET_1_1 fixes]


svn path=/branches/mono-2-6/mcs/; revision=150006
2010-01-21 18:57:26 +00:00
Zoltan Varga 6a31cfc00c 2010-01-21 Zoltan Varga <[email protected]>
* aot-compiler.c (can_marshal_struct): Allow marshalling enums.

svn path=/branches/mono-2-6/mono/; revision=149992
2010-01-21 16:43:50 +00:00
Gonzalo Paniagua Javier 8ddf3be981 2010-01-21 Gonzalo Paniagua Javier <[email protected]>
* SmtpClient.cs: rethrow inner exception so that
	AsyncCompletedEventArgs.Error gets the right value on error. Patch
	by Dimitar Dobrev.


svn path=/branches/mono-2-6/mcs/; revision=149984
2010-01-21 15:22:31 +00:00
Rodrigo Kumpera 1a71763707 2010-01-21 Rodrigo Kumpera <[email protected]>
* metadata-verify.c (parse_generic_inst): Fail a type signature if it 
	has a recursive reference to itself.

	Fixes #571863.

	Backport of r149969.



svn path=/branches/mono-2-6/mono/; revision=149971
2010-01-21 14:38:44 +00:00
Andrew Jorgensen 55d040c353 more rabbitmq madness
svn path=/branches/mono-2-6/mono/; revision=149935
2010-01-20 22:58:13 +00:00
Gonzalo Paniagua Javier 067c19988f 2010-01-20 Gonzalo Paniagua Javier <[email protected]>
* icall.c: don't raise AppDomain.TypeResolve when the type is loaded
	from the current assembly or mscorlib. Fixes bug #322957.


svn path=/branches/mono-2-6/mono/; revision=149922
2010-01-20 18:01:06 +00:00
Marek Habersack b7354f3de6 Backport of r149919
svn path=/branches/mono-2-6/mcs/; revision=149920
2010-01-20 17:49:16 +00:00
Zoltan Varga ac5e8bef12 2010-01-20 Zoltan Varga <[email protected]>
* mini-posix.c (SIG_HANDLER_SIGNATURE): Avoid
	"Thread (nil) may have been prematurely finalized" messages if this is called
	on a thread not registered with the runtime.

	* mini-exceptions.c (mono_handle_native_sigsegv): Ditto.

svn path=/branches/mono-2-6/mono/; revision=149913
2010-01-20 15:56:36 +00:00
Jb Evain 6f7167aa7e protect ILGenerator.Mono_GetCurrentOffset
svn path=/branches/mono-2-6/mcs/; revision=149904
2010-01-20 13:58:31 +00:00
Marek Habersack c84b626d9f Backport of r149855
svn path=/branches/mono-2-6/mcs/; revision=149856
2010-01-19 22:36:57 +00:00
Rodrigo Kumpera b47a076824 In metadata:
* verify.c (store_local): Better error message.
	
	Backport of r149845.

2010-01-19  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=149854
2010-01-19 21:54:38 +00:00
Marek Habersack 00313fae7e Backport of r149842
svn path=/branches/mono-2-6/mcs/; revision=149843
2010-01-19 21:14:45 +00:00
Zoltan Varga cefd26ffa4 2010-01-19 Zoltan Varga <[email protected]>
* jit-icalls.c (mono_array_new_3): New jit icall.

	* aot-compiler.c aot-runtime.c: Add support for ElementAddr wrappers.

	* arrays.cs: Add a test for 3 dimensional arrays.

svn path=/branches/mono-2-6/mono/; revision=149832
2010-01-19 17:12:51 +00:00
Zoltan Varga 94147a6867 2010-01-19 Zoltan Varga <[email protected]>
* marshal.c (mono_marshal_wrapper_info_from_wrapper): New helper function to
	return a point to a wrapper specific info structure describing the wrapper.
	(mono_marshal_get_array_address): Store the rank+elem_size in the wrapper info.

svn path=/branches/mono-2-6/mono/; revision=149831
2010-01-19 17:10:55 +00:00
Sebastien Pouliot 4ee3487474 2010-01-19 Sebastien Pouliot <[email protected]>
* security-core-clr.c (mono_security_core_clr_can_access_internals):
	Handle the case where 'basedir' can be NULL (e.g. SRE assemblies)
	[Backport r149823]


svn path=/branches/mono-2-6/mono/; revision=149824
2010-01-19 16:20:12 +00:00
Rodrigo Kumpera e17c497eca In metadata:
2010-01-19  Rodrigo Kumpera  <[email protected]>

	* icall.c (ves_icall_MonoMethod_GetGenericMethodDefinition): Handle inflated generic methods
	on a GTD.

	Backport of r149808.


svn path=/branches/mono-2-6/mono/; revision=149811
2010-01-19 12:51:30 +00:00
Marek Habersack 934a28df97 Backport of r149778
svn path=/branches/mono-2-6/mcs/; revision=149779
2010-01-18 22:34:36 +00:00
Rodrigo Kumpera b47afbf37d In metadata:
* metadata-verify.c (parse_type): Fail a type signature if it has a recursive reference
	to itself.

	* metadata-verify.c (mono_verifier_verify_typespec_signature): Change signature to take
	the token as parameter.

	* verify-internals.h: Ditto.

	* metadata.c (mono_type_create_from_typespec): Pass token to verifier.

	Fixes #571460.

	Backport of r149776.

2010-01-18  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=149777
2010-01-18 22:28:04 +00:00
Sebastien Pouliot 082f7e3aa6 2010-01-18 Sebastien Pouliot <[email protected]>
* mono-error.c: Call va_end/va_start before reusing 'args'.
	[Backport r149765]


svn path=/branches/mono-2-6/mono/; revision=149766
2010-01-18 20:09:40 +00:00
Rodrigo Kumpera 0e337eb2ae In metadata:
2010-01-18  Rodrigo Kumpera  <[email protected]>

	* class.c (mono_class_from_typeref): Fail loading of self-referencing typeref tokens.

	Fixes #569579.

	Backport of r149760.


svn path=/branches/mono-2-6/mono/; revision=149761
2010-01-18 19:11:28 +00:00
Marek Habersack 557b82af81 Backport of r149756
svn path=/branches/mono-2-6/mcs/; revision=149757
2010-01-18 17:43:40 +00:00
Zoltan Varga 3fda9b1b2c 2010-01-18 Zoltan Varga <[email protected]>
* mini.h (MonoCompile): Add 'disable_out_of_line_bblocks' flag.

	* branch-opts.c (mono_optimize_branches): Honor the new flag.

	* mini.c (mini_method_compile): Set the new flag when running under the
	debugger.

svn path=/branches/mono-2-6/mono/; revision=149753
2010-01-18 17:33:31 +00:00
Martin Baulig 50b2886808 Put the soft debugger into the 'Mono.Debugger.Soft' namespace.
svn path=/branches/mono-2-6/mcs/; revision=149743
2010-01-18 14:32:25 +00:00
Zoltan Varga a960af777a 2010-01-18 Zoltan Varga <[email protected]>
* mini.c (mono_jit_compile_method_inner): Avoid reading cfg->prof_options
	after cfg has been freed.

svn path=/branches/mono-2-6/mono/; revision=149719
2010-01-18 00:21:29 +00:00
Zoltan Varga d91e676bd4 2010-01-17 Zoltan Varga <[email protected]>
* branch-opts.c (mono_branch_optimize_exception_target): Stop the optimization
	if a clause is skipped because it uses the exception object, since it could
	have caught the exception.

	* exceptions.cs: Add a test.

svn path=/branches/mono-2-6/mono/; revision=149707
2010-01-17 08:47:29 +00:00
Zoltan Varga 28bc6c8233 2010-01-16 Zoltan Varga <[email protected]>
* debugger-agent.c (decode_value): Fix the decoding of I/U/PTR.

svn path=/branches/mono-2-6/mono/; revision=149684
2010-01-16 02:56:18 +00:00
Carlos Alberto Cortez f561a56b55 2010-01-15 Carlos Alberto Cortez <[email protected]>
* Int32Test.cs: Test for TryParse with MaxValue + 1.


svn path=/branches/mono-2-6/mcs/; revision=149681
2010-01-16 01:39:19 +00:00
Carlos Alberto Cortez 495f4bbecf 2010-01-15 Carlos Alberto Cortez <[email protected]>
* DateTimeTest.cs: Fix the tests (DateTimeStyles.AssumeUniversal is
	2.0 only).


svn path=/branches/mono-2-6/mcs/; revision=149680
2010-01-16 01:36:20 +00:00
Zoltan Varga f4af0d1edf 2010-01-16 Zoltan Varga <[email protected]>
* mini-amd64.c (emit_call_body): Always use near calls when AOTing even if
	NOMAP32BIT or optimize_for_xen is set.

svn path=/branches/mono-2-6/mono/; revision=149673
2010-01-16 00:48:27 +00:00
Carlos Alberto Cortez 16696796b9 2010-01-15 Carlos Alberto Cortez <[email protected]>
* Int32.cs: In Parse() cast the parsed value to long *before* changing
	its sign - this way we preserve the original value, instead of
	accidentally changing it. This was happening parsing _exactly_
	MaxValue + 1.
	Fixes #475815.


svn path=/branches/mono-2-6/mcs/; revision=149650
2010-01-15 21:29:47 +00:00
Rodrigo Kumpera e8852db5d6 In metadata:
2010-01-15  Rodrigo Kumpera  <[email protected]>

	* class.c (mono_class_setup_fields): Guard against unfinished types. This
	happens only on 2.6 and not trunk because trunk better deals with unfinished types. 


svn path=/branches/mono-2-6/mono/; revision=149642
2010-01-15 17:11:39 +00:00
Marek Habersack 7ca6f7a3a6 Backport of r149631
svn path=/branches/mono-2-6/mcs/; revision=149632
2010-01-15 13:24:25 +00:00
Atsushi Eno 833bb1cf96 backport r149619 and r149620.
svn path=/branches/mono-2-6/mcs/; revision=149630
2010-01-15 12:42:13 +00:00
Atsushi Eno 159dce275c backport r149609, r149612, r149617 and r149618.
svn path=/branches/mono-2-6/mcs/; revision=149626
2010-01-15 12:40:53 +00:00
Atsushi Eno 8d4203be63 backport r149611 and r149614.
svn path=/branches/mono-2-6/mcs/; revision=149625
2010-01-15 12:38:14 +00:00
Rodrigo Kumpera f54f538a50 In metadata:
2010-01-14  Rodrigo Kumpera  <[email protected]>

	* class.c (mono_type_has_exceptions): Check the generic instance. It can fail
	independently of the GTD.

	* class.c (mono_class_setup_fields): Fail if field has negative offset.

	* class.c (mono_class_setup_fields): Fail if valuetype has zero size. Add sizeof(MonoObject)
	to the upper limit since instance_size includes this amount.

	* class.c (mono_class_layout_fields): Check if the types of the static fields have failed.

	Fixes #569544.

	Backport of r149575.


svn path=/branches/mono-2-6/mono/; revision=149576
2010-01-14 21:12:46 +00:00
Jb Evain 59887d8819 2010-01-14 Jb Evain <[email protected]>
* MarkStep.cs: preserve fields specified by the
	SoapHeader attribute.

	backport r149571.

svn path=/branches/mono-2-6/mcs/; revision=149572
2010-01-14 18:12:41 +00:00
Rolf Bjarne Kvinge 585a395a95 2010-01-14 Rolf Bjarne Kvinge <[email protected]>
* UnmanagedMemoryStream.cs: Read: don't read bytes one-by-one, read all
	at once.

svn path=/branches/mono-2-6/mcs/; revision=149556
2010-01-14 13:17:53 +00:00
Jonathan Pryor 52f97eb8ed * Monodoc/provider.cs, Monodoc/ecma-provider.cs: Improve cache support
by having EcmaHelpSource.GetTextFromUrl() look for cached contents.
	  This greatly speeds up type member listings (e.g. T:...List`1/*),
	  e.g. from ~2.0s to 0.06s.
	* Mono.Documentation/XmlDocUtils.cs: XmlDocUtils.AddExtensionMethods()
	  wasn't adding extension methods which matched *interfaces* of base
	  classes.  Result: Mono.Options.OptionSet (which inherits
	  System.Collections.ObjectModel.KeyedCollection`2 which inherits from
	  System.Collections.ObjectModel.Collection`1 which implements
	  System.Collections.Generic.IEnumerable`1) wasn't getting any of the
	  LINQ extension methods (which is bad).  Fix this.
	* Resources/mdoc-html-utils.xsl: Fix regression caused by 2009-12-02
	  commit adding GetLinkTargetHtml().  The problem was that when
	  running within ASP.NET/monodoc ~all extension method links would be
	  'javascript:alert("...")M:Foo.Method(...)', which is clearly wrong.
	  This occurred because $linkid's generation would always call
	  GetLinkTargetHtml() with a $cref value of '', thus the monodoc
	  GetLinkTarget() would return '', so GetLinkTargetHtml() would return
	  the javascript "not found" alert.  Thus, we can't expect
	  GetLinkTargetHtml() with $cref='' to work under monodoc, but it's
	  ~required to work sanely under 'mdoc export-html'.
	  Solution is to not call GetLinkTargetHtml() here UNLESS we're doing
	  'mdoc export-html' generation, which we assume to be the case if
	  $html-anchor is true.

svn path=/branches/mono-2-6/mcs/; revision=149553
2010-01-14 12:50:31 +00:00
Jonathan Pryor b51b58935f * Mono.Documentation/monodocs2slashdoc.cs: Fix NamespaceSummaries.xml
generation to look at the ns-NAMESPACE.xml files, not just
	  NAMESPACE.xml files.

svn path=/branches/mono-2-6/mcs/; revision=149552
2010-01-14 12:46:19 +00:00
Geoff Norton 9c6bce34ae fix monotouch build
svn path=/branches/mono-2-6/mcs/; revision=149503
2010-01-13 23:56:36 +00:00
Gonzalo Paniagua Javier 5768c58fd6 2010-01-13 Gonzalo Paniagua Javier <[email protected]>
* HttpWebRequest.cs: when the server returns several different
	authentication methods, pick the one that works.
	Fixes bug #562043.


svn path=/branches/mono-2-6/mcs/; revision=149501
2010-01-13 23:23:03 +00:00
Sebastien Pouliot 4dea4c540e 2010-01-13 Sebastien Pouliot <[email protected]>
* HttpWebRequest_2_1.cs: Throw for CookieContainer. It is 
	implemented only in the client http stack (and for a limited
	time in the browser stack too ;-)
	* InternalWebRequestStreamWrapper.cs: Keep the MemoryStream data
	available after closing/disposing (by user) since our own code
	will need it later (e.g. when posting like DRT287)
	* WebHeaderCollection_2_1.cs: Provide an argument to 
	ArgumentException. Found by Gendarme's ArgumentException
	InstantiateArgumentExceptionCorrectlyRule
	[Backport r149484]


svn path=/branches/mono-2-6/mcs/; revision=149485
2010-01-13 18:40:46 +00:00
Paolo Molaro 77d06337e6 Wed Jan 13 15:54:53 CET 2010 Paolo Molaro <[email protected]>
* jit.h, method-to-ir.c: added ability to set the policy for
	inserting breakpoints from the break IL instruction or the
	Debugger.Break () API call.


svn path=/branches/mono-2-6/mono/; revision=149473
2010-01-13 15:03:00 +00:00
Jb Evain a5f096e879 2010-01-13 Jb Evain <[email protected]>
* MarkStep.cs: preserve methods specified by the
	XmlSchemaProvider attribute.

	backport r149460.

svn path=/branches/mono-2-6/mcs/; revision=149461
2010-01-13 13:28:35 +00:00
Atsushi Eno 694b59cf8a Fix build (forgotten backport bits).
svn path=/branches/mono-2-6/mcs/; revision=149446
2010-01-13 11:06:12 +00:00
Atsushi Eno 9aa5cfdf6b backport r149383 and r149411 from trunk.
svn path=/branches/mono-2-6/mcs/; revision=149442
2010-01-13 09:57:22 +00:00
Atsushi Eno 966ebb8976 backport recent bugfixes from trunk.
svn path=/branches/mono-2-6/mcs/; revision=149440
2010-01-13 09:48:37 +00:00
Atsushi Eno 5249c14350 backport recent bugfixes from trunk.
svn path=/branches/mono-2-6/mcs/; revision=149439
2010-01-13 09:47:12 +00:00
Sebastien Pouliot 3b33f27d09 2010-01-12 Sebastien Pouliot <[email protected]>
* WebRequest_2_1.cs: Rework registration wrt the two, browser
	and client, stacks offered in SL3. Only global works now.
	[Backport r149423]


svn path=/branches/mono-2-6/mcs/; revision=149424
2010-01-12 18:44:17 +00:00
Rodrigo Kumpera 326b9a5c59 In metadata:
* class.c (mono_class_get_implemented_interfaces): Now take a MonoError argument.

	* class.c:
	* cominterop.c:
	* icall.c:
	* object.c: 
	* class-internals.h: Adjust for new signature of mono_class_get_implemented_interfaces.

	Backport of r149414.

2010-01-12  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=149417
2010-01-12 16:54:28 +00:00
Rodrigo Kumpera bf875af2e7 In metadata:
2010-01-12  Rodrigo Kumpera  <[email protected]>

	* class.c (mono_class_setup_interfaces): Now take a MonoError argument and
	it can fail loading the type.

	* class.c: Add mono_class_inflate_generic_class_checked.

	* class.c:
	* verify.c:
	* class-internals.h: Adjust for new signature of mono_class_setup_interfaces.

	Backport of r149413.


svn path=/branches/mono-2-6/mono/; revision=149415
2010-01-12 16:50:33 +00:00
Sebastien Pouliot f76fb4d9af In Test/System.Net:
2010-01-12  Sebastien Pouliot  <[email protected]>

	* NetworkCredentialTest.cs: New. Unit tests.
	[Backport r149401]

In System.Net:
2010-01-12  Sebastien Pouliot  <[email protected]>

	* NetworkCredential.cs: Fix properties to never return null.

In .:
2010-01-12  Sebastien Pouliot  <[email protected]>

	* System_test.dll.sources: Add NetworkCredentialTest.cs to the tests
	[Backport r149401]


svn path=/branches/mono-2-6/mcs/; revision=149402
2010-01-12 13:09:49 +00:00
Zoltan Varga 6ddb87775a 2010-01-12 Zoltan Varga <[email protected]>
* profiles/basic.make: Document that mono 2.6 can't be compiled with mono SVN HEAD.

svn path=/branches/mono-2-6/mcs/; revision=149365
2010-01-12 02:12:52 +00:00
Carlos Alberto Cortez 7812e1a803 2010-01-11 Carlos Alberto Cortez <[email protected]>
* Int32Test.cs: Add test case for exponent support in the Parse
	methods.


svn path=/branches/mono-2-6/mcs/; revision=149359
2010-01-11 23:57:32 +00:00
Carlos Alberto Cortez 51098747b2 2010-01-11 Carlos Alberto Cortez <[email protected]>
* Int32.cs: Implement support for exponent in the Parse methods.
	Fixes #542464.

	Backport r149356.


svn path=/branches/mono-2-6/mcs/; revision=149358
2010-01-11 23:50:19 +00:00
Zoltan Varga 07d7a708a8 2010-01-11 Zoltan Varga <[email protected]>
* socket-io.c (AI_ADDRCONFIG): Applied patch from John Lightsey ([email protected]).
	Fixes build on rh 7.3.

svn path=/branches/mono-2-6/mono/; revision=149345
2010-01-11 22:28:10 +00:00
Zoltan Varga 9fb43d41e5 2010-01-11 Zoltan Varga <[email protected]>
* mono-profiler-logging.c (_ProfilerFileWriteBuffer): Use MONO_ZERO_LEN_ARRAY.
	Fixes #569806.

svn path=/branches/mono-2-6/mono/; revision=149343
2010-01-11 22:24:30 +00:00
Andrew Jorgensen dd528c7e82 add RabbitMQ.Client.Apigen
svn path=/branches/mono-2-6/mono/; revision=149341
2010-01-11 21:35:25 +00:00
Zoltan Varga 2eb18ee5c3 2009-12-16 Zoltan Varga <[email protected]>
* class.c (mono_bounded_array_class_get): Make these classes PUBLIC. Fixes
	#565120.

svn path=/branches/mono-2-6/mono/; revision=149337
2010-01-11 21:01:50 +00:00
Zoltan Varga 2fef9fed47 2009-12-26 Zoltan Varga <[email protected]>
* monitor.c (ves_icall_System_Threading_Monitor_Monitor_wait): Don't close the
	wait handle if the wait is interrupted, since it is still in mon->wait_list, and
	we can't remove it from it since we don't hold the lock.
	(mon_new): Free the orphaned events here when a mon structure is added to the
	freelist. Fixes #561239. Thanks to Mike Rieker <[email protected]> for tracking
	this down.

svn path=/branches/mono-2-6/mono/; revision=149335
2010-01-11 21:00:46 +00:00
Zoltan Varga 8a62669178 2009-12-26 Zoltan Varga <[email protected]>
* generic-sharing.c (instantiate_other_info): Avoid creating jump trampolines since
	they cannot be patched. Partly fixes #564408.

svn path=/branches/mono-2-6/mono/; revision=149333
2010-01-11 20:59:44 +00:00
Sebastien Pouliot 63983799a4 Makefile: For 2.1 build System.Core.dll before System.Net.dll
svn path=/branches/mono-2-6/mcs/; revision=149332
2010-01-11 20:55:02 +00:00
Sebastien Pouliot 53cb002de6 In .:
2010-01-11  Sebastien Pouliot  <[email protected]>

	* System.Net.dll.sources: Add InternalWebRequestStreamWrapper.cs
	* Makefile: Add reference to System.Core (for Action<T>)
	[Backport r149327]

In System.Net:
2010-01-11  Sebastien Pouliot  <[email protected]>

	* InternalWebRequestStreamWrapper.cs: New. Moved (and adapted) 
	from Moonlight System.Windows.Browser assembly.
	* InternalWebResponseStreamWrapper.cs: New. Moved (and adapted) 
	from Moonlight System.Windows.Browser assembly.
	* WebClient_2_1.cs: Remove custom delegate declaration (Gendarme's
	AvoidDeclaringCustomDelegatesRule). Remove locking over a variable
	(Gendarme's ReviewLockUsedOnlyForOperationsOnVariablesRule). 
	Avoid potential race with event handlers (Gendarme's 
	ProtectCallsToEventDelegatesRule). Implement OnWriteStreamClosed
	* WebRequest_2_1.cs: Signature change from delegate to 
	Action<long,long,object>. Found using Gendarme's
	AvoidDeclaringCustomDelegatesRule
	[Backport r149327]


svn path=/branches/mono-2-6/mcs/; revision=149328
2010-01-11 20:29:41 +00:00
Zoltan Varga deffbb6a29 2010-01-11 Zoltan Varga <[email protected]>
* debugger-agent.c (mono_debugger_agent_parse_options): Allow onthrow without
	an argument which matches any exception.

svn path=/branches/mono-2-6/mono/; revision=149297
2010-01-11 04:09:34 +00:00
Carlos Alberto Cortez aa6f7b9be1 2010-01-10 Carlos Alberto Cortez <[email protected]>
* ToolStripMenuItemTest: New test for the events related to the check
	state.


svn path=/branches/mono-2-6/mcs/; revision=149293
2010-01-11 00:46:58 +00:00
Carlos Alberto Cortez e6ebacb2b4 2010-01-10 Carlos Alberto Cortez <[email protected]>
* ToolStripMenuItem.cs: Put the Checked/CheckState logic in a single
	place and synchronize the events properly. Fixes a lack of
	coordination between the events - which should be fired together.


svn path=/branches/mono-2-6/mcs/; revision=149291
2010-01-11 00:43:36 +00:00
Zoltan Varga 5fa55c5f7f 2010-01-10 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_emit_method_call_full): Avoid the virt->nonvirt
	optimization if the called method is gshared and marshalbyref, since gshared
	methods can' have wrappers. Fixes #569390.

	* generics.cs: Add a test.

svn path=/branches/mono-2-6/mono/; revision=149287
2010-01-10 22:42:31 +00:00
Zoltan Varga 190fc745e1 2010-01-10 Zoltan Varga <[email protected]>
* mini-exceptions.c (mono_print_thread_dump_from_ctx): New helper function
	callable from gdb.

svn path=/branches/mono-2-6/mono/; revision=149281
2010-01-10 01:53:19 +00:00
Zoltan Varga 2af95eb471 2010-01-10 Zoltan Varga <[email protected]>
* mini.c (mono_print_method_from_ip): Fix the lookup of trampolines.

svn path=/branches/mono-2-6/mono/; revision=149279
2010-01-10 01:34:01 +00:00
Zoltan Varga 76d3cbb00c 2010-01-09 Zoltan Varga <[email protected]>
* debugger-agent.c (transport_connect): comment out freeaddrinfo calls under win32,
	since it is not supported in win2000.

svn path=/branches/mono-2-6/mono/; revision=149275
2010-01-09 21:28:57 +00:00
Carlos Alberto Cortez 64358872dc 2010-01-09 Carlos Alberto Cortez <[email protected]>
* TrackBarTest.cs: New test for events.


svn path=/branches/mono-2-6/mcs/; revision=149272
2010-01-09 18:28:07 +00:00
Carlos Alberto Cortez 8d5112637e 2010-01-09 Carlos Alberto Cortez <[email protected]>
* TrackBar.cs: Move our events code to a single method, allowing it to
	optionally fire the Scroll event. This way we both avoid the
	duplicated calls to OnScroll and also will be able to fire Scroll
	*before* OnValueChanged in other places.
	Fixes #568026.


svn path=/branches/mono-2-6/mcs/; revision=149271
2010-01-09 17:18:42 +00:00
Marek Habersack 4b70cd35d5 Backport of r149262
svn path=/branches/mono-2-6/mcs/; revision=149263
2010-01-09 00:31:01 +00:00
Jb Evain 180d854345 2010-01-08 Jb Evain <[email protected]>
* Expression.cs (Call): properly deal with zero length array
	of type arguments for non generic methods. Fixes #568989.

	backport r149241.

svn path=/branches/mono-2-6/mcs/; revision=149242
2010-01-08 14:02:03 +00:00
Atsushi Eno e950db318c more complete backporting.
svn path=/branches/mono-2-6/mcs/; revision=149218
2010-01-08 04:51:52 +00:00
Atsushi Eno 21fba62c09 more complete backporting.
svn path=/branches/mono-2-6/mcs/; revision=149217
2010-01-08 04:50:11 +00:00
Atsushi Eno 98ea1eb62a backport everything, now that I believe it became at least as stable as it used to be.
svn path=/branches/mono-2-6/mcs/; revision=149216
2010-01-08 04:48:50 +00:00
Atsushi Eno 32a31d1e4d backport everything.
svn path=/branches/mono-2-6/mcs/; revision=149213
2010-01-08 04:32:53 +00:00
Atsushi Eno 274f525ab1 backport everything from trunk.
svn path=/branches/mono-2-6/mcs/; revision=149211
2010-01-08 04:17:00 +00:00
Gonzalo Paniagua Javier 8eeae714e4 2010-01-07 Gonzalo Paniagua Javier <[email protected]>
* assembly.c: fix MONO_PATH debug output.


svn path=/branches/mono-2-6/mono/; revision=149191
2010-01-07 20:34:17 +00:00
Sebastien Pouliot 47a0c65e12 2010-01-07 Sebastien Pouliot <[email protected]>
* Consts.cs.in: Update FX version for SL3 latest released version
	[Backport r149187]


svn path=/branches/mono-2-6/mcs/; revision=149188
2010-01-07 20:21:42 +00:00
Jb Evain fd29972f85 fix the net_1_1 build
svn path=/branches/mono-2-6/mcs/; revision=149178
2010-01-07 16:28:30 +00:00
Jb Evain 6fc40bbb24 fix the net_1_1 build
svn path=/branches/mono-2-6/mcs/; revision=149177
2010-01-07 16:27:41 +00:00
Jb Evain 4054667f43 in System:
2010-01-07  Jb Evain  <[email protected]>

	* MonoType.cs (.MemberType): return the proper member type
	for generic parameters.

	backport r149175.

in Test/System:
2010-01-07  Jb Evain  <[email protected]>

	* TypeTest.cs: add test for the MemberType of
	a generic parameter.

	backport r149175.

svn path=/branches/mono-2-6/mcs/; revision=149176
2010-01-07 16:22:58 +00:00
Sebastien Pouliot 487ee8a3d0 In System:
2010-01-07  Sebastien Pouliot  <[email protected]>

	* Convert.cs: Fix line endings in ToBase64String (bug #568778)
	and also the default line length. Code changed to not require
	a BinaryReader over a MemoryStream to reduce memory requirements.
	[Backport r149171]

In Test/System:
2010-01-07  Sebastien Pouliot  <[email protected]>

	* ConvertTest.cs: Add test case for #568778 and the default
	line length.
	[Backport r149171]

In System.Security.Cryptography:
2010-01-07  Sebastien Pouliot  <[email protected]>

	* ToBase64Transform.cs: Static-ify some methods to make it easier 
	to use from System.Convert
	[Backport r149171]


svn path=/branches/mono-2-6/mcs/; revision=149172
2010-01-07 15:24:21 +00:00
Zoltan Varga 6cbb31843f 2010-01-07 Zoltan Varga <[email protected]>
* mini-llvm-cpp.cpp (mono_llvm_create_ee): Add an ugly hack to fix #564695.
	If LLVM decides to set the code model to Large, reset it to Default.

svn path=/branches/mono-2-6/mono/; revision=149160
2010-01-07 07:19:18 +00:00
Zoltan Varga d25ef310a2 2010-01-07 Zoltan Varga <[email protected]>
* aot-compiler.c (mono_xdebug_flush): Export it so it is present in
	stripped binaries as well.

svn path=/branches/mono-2-6/mono/; revision=149154
2010-01-07 03:08:48 +00:00
Jb Evain 944fde135c 2010-12-06 Jb Evain <[email protected]>
* Descriptors/mscorlib.xml: optimize descriptor.

svn path=/branches/mono-2-6/mcs/; revision=149120
2010-01-06 13:28:40 +00:00
Marek Habersack dc6936d47a Backport of r149116
svn path=/branches/mono-2-6/mcs/; revision=149117
2010-01-06 09:29:59 +00:00
Atsushi Eno 0bbfa99e64 backport r149104.
svn path=/branches/mono-2-6/mcs/; revision=149105
2010-01-06 04:34:22 +00:00
Marek Habersack 3d1a899564 Backport of r149089
svn path=/branches/mono-2-6/mcs/; revision=149090
2010-01-05 23:13:27 +00:00
Rodrigo Kumpera 79563d2fff In System.Reflection:
* ParameterInfo.cs (DefaultProperty): Fix small typo.

2010-01-05 Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mcs/; revision=149088
2010-01-05 22:14:57 +00:00
Rodrigo Kumpera 1269ad94c2 In Test/System.Reflection:
2010-01-05 Rodrigo Kumpera  <[email protected]>

	* DateTimeConstantAttribute.cs: Add internal Ticks property.

	Backport of r149083.

In System.Runtime.CompilerServices:
2010-01-05 Rodrigo Kumpera  <[email protected]>

	* DateTimeConstantAttribute.cs: Add internal Ticks property.

	Backport of r149083.

In System.Reflection:
2010-01-05 Rodrigo Kumpera  <[email protected]>

	* ParameterInfoTest.cs: Add a test for default values from custom
	attributes.

	Backport of r149083.


svn path=/branches/mono-2-6/mcs/; revision=149084
2010-01-05 18:08:18 +00:00
Rodrigo Kumpera bbb57e05d6 In metadata:
2010-01-05  Rodrigo Kumpera  <[email protected]>

	* verify.c (mono_verifier_verify_class): Properly check for broken parent. Ignore
	types that are meant to not have a parent.

	Backport of r149053.

In mini:
2010-01-05  Rodrigo Kumpera  <[email protected]>

	* mini.c (mono_compile_is_broken): Skip methods from serialization's
	internal assembly.

	Backport of r149053.


svn path=/branches/mono-2-6/mono/; revision=149082
2010-01-05 16:42:15 +00:00
Sebastien Pouliot e5c119df53 pedump.c: Backport earlier fixes from Rodrigo Kumpera since they are useful for testing ML
svn path=/branches/mono-2-6/mono/; revision=149081
2010-01-05 14:40:11 +00:00
Marek Habersack 6e9cf155eb Backport of r149077
svn path=/branches/mono-2-6/mcs/; revision=149078
2010-01-05 12:13:49 +00:00
Carlos Alberto Cortez ec76cba184 2010-01-04 Carlos Alberto Cortez <[email protected]>
* RadioButton.cs: When drawing, if Appearance is Button use the old
	normal routine in the theme engine, instead of using the one in 2.0,
	since this last one doesn't support proper rendering of the control as
	a button.
	Fixes #567904.


svn path=/branches/mono-2-6/mcs/; revision=149075
2010-01-05 11:40:54 +00:00
Zoltan Varga 65d6041639 2010-01-04 Zoltan Varga <[email protected]>
* mini-trampolines.c (mono_convert_imt_slot_to_vtable_slot): Call
	mono_method_get_vtable_slot () instead of accessing imt_method->slot directly,
	to fix an AOT case.

svn path=/branches/mono-2-6/mono/; revision=149057
2010-01-04 22:11:44 +00:00
Zoltan Varga 5684426f99 2009-12-22 Geoff Norton <[email protected]>
* configure.in: Fix invalid escaping.  Patch from Spina from
	www.slacky.eu.

svn path=/branches/mono-2-6/mono/; revision=149049
2010-01-04 21:04:51 +00:00
Rodrigo Kumpera 6661518399 In mini:
2009-01-04  Rodrigo Kumpera  <[email protected]>

	* mini.c (mini_method_compile): Verify the method before calling
	mono_compile_create_vars as this might crash since it uses method
	information.

	Fixes #560196.

	Backport of r149045.


svn path=/branches/mono-2-6/mono/; revision=149046
2010-01-04 19:52:28 +00:00
Sebastien Pouliot 2ab4b20086 verify.c (verify_valuetype_layout_with_target): Fix case that can lead to infinite recursion. Fix bug #567861. [Backport r149042]
svn path=/branches/mono-2-6/mono/; revision=149043
2010-01-04 18:47:21 +00:00
Rodrigo Kumpera 3cf6a9d9dd In metadata:
* class.c (count_virtual_methods): Remove the assert and now
	fail properly.
	
	* class.c (setup_interface_offsets): This can fail now.

	* class.c (mono_class_setup_vtable_general): Check for parent vtable
	errors. Check setup_interface_offsets errors.

	* class.c (setup_interface_offsets): Simplify the return error logic
	and remove class_init_ok.

	Fixes #560327.

	Backport of r149031.

2010-01-04  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=149032
2010-01-04 17:01:50 +00:00
Rodrigo Kumpera a5861ec5c9 In metadata:
2010-01-04  Rodrigo Kumpera  <[email protected]>

	* class.c (mono_class_init): Do class verification at the beginning. Add
	some asserts to avoid tripping into invalid memory.

	* object.c (compute_class_bitmap): Replace a g_assert_not_reached with a
	g_error and a decent message.

	* verify.c (mono_verifier_verify_class): Verify for invalid super type.

	Fixes #567548.

	Backport of r149028.


svn path=/branches/mono-2-6/mono/; revision=149029
2010-01-04 16:02:06 +00:00
Jonathan Pryor 7ecd46bab0 * Makefile: Ensure that Test/* files are distributed (so that
'make check' works on tarball builds).  Partial fix for #564987.

svn path=/branches/mono-2-6/mcs/; revision=149024
2010-01-04 13:15:37 +00:00
Jb Evain 7ce982039b 2010-01-04 Jb Evain <[email protected]>
* TimeZoneInfo.AdjustmentRule.cs, TimeZoneInfo.TransitionTime.cs:
	Do not include in both mscorlib and System.Core for a NET_2_1 profile.

	backport r149020.

svn path=/branches/mono-2-6/mcs/; revision=149021
2010-01-04 12:54:21 +00:00
Carlos Alberto Cortez 4721b6805e 2010-01-03 Carlos Alberto Cortez <[email protected]>
* GroupBoxRenderer.cs: Properly use SystemColors.GrayText to draw to
	text of the group box if it is disabled.
	Fixes #567847.


svn path=/branches/mono-2-6/mcs/; revision=149013
2010-01-04 11:51:26 +00:00
Zoltan Varga 3c40535253 2010-01-03 Zoltan Varga <[email protected]>
* marshal.c (mono_marshal_get_runtime_invoke): Fix a memory leak.

svn path=/branches/mono-2-6/mono/; revision=148990
2010-01-03 16:48:55 +00:00
Zoltan Varga 0dffa52aca 2010-01-03 Zoltan Varga <[email protected]>
* mono-path.c (mono_path_resolve_symlinks): Use g_strfreev () to free the
	result of g_strplit.

svn path=/branches/mono-2-6/mono/; revision=148985
2010-01-03 16:36:16 +00:00
Zoltan Varga 3f88554113 2010-01-03 Zoltan Varga <[email protected]>
* TransactionAbortedException.cs: Make the default ctor public. Fixes #567872.

svn path=/branches/mono-2-6/mcs/; revision=148979
2010-01-03 14:15:24 +00:00
Zoltan Varga 368500522a 2010-01-03 Zoltan Varga <[email protected]>
* Array.cs: Fix ArrayReadOnlyList.CopyTo. Fixes #564095.

svn path=/branches/mono-2-6/mcs/; revision=148976
2010-01-03 14:10:45 +00:00
Zoltan Varga 613462c324 2010-01-03 Zoltan Varga <[email protected]>
* DateTime.cs (TryParseExact): Handle exceptions. Fixes #567857.

svn path=/branches/mono-2-6/mcs/; revision=148972
2010-01-03 13:53:55 +00:00
Zoltan Varga f084c27e38 2010-01-03 Zoltan Varga <[email protected]>
* locales.c (construct_culture_from_specific_name): Applied patch from
	José Antonio Sánchez Lázaro <[email protected]>. Fix a crash if a culture was
	not found. Fixes #567900.

svn path=/branches/mono-2-6/mono/; revision=148969
2010-01-03 13:29:53 +00:00
Carlos Alberto Cortez a74918503e 2009-12-31 Carlos Alberto Cortez <[email protected]>
* XplatUICarbon.cs: Implement the overriden AudibleAlert
	function in XplatUICarbon.  Currently it throws
	NotImplementedException which will kill a WinForms application showing
	a dialog box.
	Patch by  Erik Ylvisaker ([email protected]).


svn path=/branches/mono-2-6/mcs/; revision=148958
2009-12-31 23:42:10 +00:00
Sebastien Pouliot caf8ea503e loader.c (mono_method_get_signature_full): Remove two asserts. Return NULL instead so that the verifier can handle both cases gracefully. Fix bug #564897. [Backport r148951]
svn path=/branches/mono-2-6/mono/; revision=148952
2009-12-31 15:19:39 +00:00
Rodrigo Kumpera c78ca4093b In metadata:
* class.c (mono_class_setup_methods): Use checked version of mono_class_inflate_generic_method_full
	so we can properly fail types instead of crashing.

	Fixes #567676.

	Backpor of r148948.

2009-12-30  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=148949
2009-12-30 20:41:17 +00:00
Jonathan Pryor 0089ae3369 * Lucene.Net/Lucene.Net/QueryParser/QueryParser.cs: Fix crash when
searching for "()".  Fixes #423853.  
	  Thanks to Benoît Tuduri <[email protected]>.

svn path=/branches/mono-2-6/mcs/; revision=148945
2009-12-30 20:03:48 +00:00
Rodrigo Kumpera 27e2e40074 In metadata:
2009-12-30  Rodrigo Kumpera  <[email protected]>

	* marshal.c (mono_mb_emit_restore_result): Properly handle generic enums.

	Backport of r148941.

In mini:
2009-12-30  Rodrigo Kumpera  <[email protected]>

	* mini.c:
	* method-to.ir.c:
	* mini-*.c: Properly handle generic enums.

	Fixes #566294

	Backport of r148941.


svn path=/branches/mono-2-6/mono/; revision=148942
2009-12-30 13:49:56 +00:00
Sebastien Pouliot f06264ae54 2009-12-28 Sebastien Pouliot <[email protected]>
* Cookie.cs: Don't use automatic properties to let older mcs
	(e.g. bootstrap) compile this for NET_1_1 profile


svn path=/branches/mono-2-6/mcs/; revision=148921
2009-12-28 17:15:24 +00:00
Zoltan Varga 2a1e433854 2009-12-28 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir): Handle the failure of mono_class_vtable ()
	in a few more places.

svn path=/branches/mono-2-6/mono/; revision=148916
2009-12-28 01:58:45 +00:00
Zoltan Varga cf04036d5d 2009-12-27 Zoltan Varga <[email protected]>
* aot-compiler.c (add_wrappers): Don't use dyn runtime invoke for methods with
	nullable parameters. Fixes #567351.

svn path=/branches/mono-2-6/mono/; revision=148914
2009-12-27 16:16:59 +00:00
Rodrigo Kumpera b7e171bc2d In metadata:
* verify.c (init_stack_with_value_at_exception_boundary): Do stack overflow checking here
	as max stack might be zero.

	Fixes #562320.

	Backport of r148911.

2009-12-26  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=148912
2009-12-27 00:13:10 +00:00
Rodrigo Kumpera f883d707c6 In metadata:
Rework all uses of mono_class_setup_methods to accept that it can fail now.

	* class.c (mono_class_setup_methods): This function now can fail the class. Do so for generic
	instances if the GTD did.

	* class.c (mono_class_setup_properties): Ditto.

	* class.c (mono_class_setup_events): Ditto.

	* class.c (mono_class_setup_vtable): Fail early if the type is already broken.

	* class.c (mono_class_setup_vtable_general): Add a few more missing broken type checks.	Sanitize
	error setting.

	* class.c (mono_class_init): Fail if GTD did.

	* cominterop.c:
	* generic-sharing.c:
	* icall.c:
	* loader.c:
	* object.c:
	* verify.c: Properly handle failure of mono_class_setup_methods.

	Backport of r148905.

2009-12-26  Rodrigo Kumpera  <[email protected]>

In mini:
2009-12-26  Rodrigo Kumpera  <[email protected]>

	* mini-trampolines.c (common_call_trampoline): Add assert for NULL resolved generic method.

	Backport of r148905.


svn path=/branches/mono-2-6/mono/; revision=148907
2009-12-26 21:41:45 +00:00
Rodrigo Kumpera 9f33f36695 In metadata:
2009-12-26  Rodrigo Kumpera  <[email protected]>

	* class-internals.c: Add mono_class_inflate_generic_method_full_checked and make
	mono_class_inflate_generic_method_full internal.

	* class.c (inflate_generic_context): Now takes a MonoError argument.

	* class.c (mono_class_inflate_generic_method_full): Now calls the _checked and abort on
	errors.

	Backport of r148904.


svn path=/branches/mono-2-6/mono/; revision=148906
2009-12-26 21:24:28 +00:00
Zoltan Varga 95b7204a39 2009-12-26 Zoltan Varga <[email protected]>
* domain.c (mono_domain_free): Backport part of r143047. Free special static
	fields earlier to avoid crashes if the types they refer to are freed. Fixes
	#565923.

svn path=/branches/mono-2-6/mono/; revision=148903
2009-12-26 16:32:37 +00:00
Sebastien Pouliot c8750dd6f6 In Test/System.Net:
2009-12-24  Sebastien Pouliot  <[email protected]>

	* CookieContainerTest.cs: Split many tests into smaller test 
	cases. Add test cases for DefaultPerDomainCookieLimit and
	DefaultCookieLimit. Remove all, but one 1.x, [Category 
	("NotWorking")] since everything works now.

In System.Net:
2009-12-24  Sebastien Pouliot  <[email protected]>

	* Cookie.cs: Re-work ToString to be useable in more cases. Fix
	some issues found by Gendarme.
	* CookieContainer.cs: Fix 2.0 NonWorking (and new) unit tests.
	Implement removing oldest cookies when limits are reached.
	* CookieCollection.cs: Fix sort to be closer to MS implementation
	(but still not 100% identical). Fix some issues found by Gendarme


svn path=/branches/mono-2-6/mcs/; revision=148892
2009-12-24 18:20:36 +00:00
Sebastien Pouliot 5a843f6077 2009-12-24 Sebastien Pouliot <[email protected]>
* method-to-ir.c (mono_method_to_ir): Avoid SIGSEGV when
	mono_method_get_signature returns NULL. Fix #567084
	[Backport r148889]


svn path=/branches/mono-2-6/mono/; revision=148890
2009-12-24 13:50:32 +00:00
Geoff Norton 4f7e1e0e33 2009-10-05 Atsushi Enomoto <[email protected]>
* JsonReader.cs : \uXXXX parser was totally wrong, giving wrong #.

svn path=/branches/mono-2-6/mcs/; revision=148881
2009-12-23 23:08:26 +00:00
Geoff Norton 05b1685a6a 2009-12-23 Geoff Norton <[email protected]>
* DeflateStream.cs: Ensure our callbacks go into the correct
	static methods.

svn path=/branches/mono-2-6/mcs/; revision=148866
2009-12-23 17:03:22 +00:00
Zoltan Varga 2ec1db8f85 2009-12-23 Zoltan Varga <[email protected]>
* mini-trampolines.c (mono_create_llvm_imt_trampoline): Fix the LLVM build on
	platforms without mono_arch_get_llvm_imt_trampoline ().

svn path=/branches/mono-2-6/mono/; revision=148864
2009-12-23 15:02:00 +00:00
Jo Shields 74ee0e1382 Backport r148856 from trunk to fix broken RabbitMQ build
svn path=/branches/mono-2-6/mcs/; revision=148857
2009-12-23 02:34:36 +00:00
Geoff Norton a1757b0a1a fix typo
svn path=/branches/mono-2-6/mono/; revision=148851
2009-12-22 19:16:36 +00:00
Zoltan Varga 1cf6dce252 2009-12-22 Zoltan Varga <[email protected]>
* aot-runtime.c (decode_klass_ref): Avoid a crash if a decode_klass_ref () call
	fails. Fixes #566689.

svn path=/branches/mono-2-6/mono/; revision=148849
2009-12-22 17:51:57 +00:00
Jo Shields 53acd847f0 Backport r148843 and r148844 from trunk
svn path=/branches/mono-2-6/mono/; revision=148846
2009-12-22 17:44:20 +00:00
Marek Habersack a14f404bd5 Backport of r148840
svn path=/branches/mono-2-6/mcs/; revision=148841
2009-12-22 12:24:48 +00:00
Rodrigo Kumpera 8e3c81eb2d In .:
2009-12-21  Rodrigo Kumpera  <[email protected]>

	* loader.c (mono_method_get_signature_full): Check if the returned signature is compatible
	with the one from the original method.

	* metadata-verify.c (mono_verifier_is_sig_compatible): New function to verify signature
	compatibility.

	* verify-internals.h: Add new function to the internal API.

	Fixes #566295.

	Backport of r148828.


svn path=/branches/mono-2-6/mono/; revision=148829
2009-12-22 01:18:25 +00:00
Sebastien Pouliot c0639bae0e 2009-12-21 Sebastien Pouliot <[email protected]>
* File.cs (ReadAllBytes): We cannot assume that a single call to
	Read will return all the data we require.
	[Backport r148822]


svn path=/branches/mono-2-6/mcs/; revision=148823
2009-12-21 22:41:03 +00:00
Zoltan Varga 352161e5dc In :
2009-12-21  Zoltan Varga  <[email protected]>

	* configure.in: Add an LLVM_CFLAGS automake variable.

In mono/mini:

2009-12-21  Zoltan Varga  <[email protected]>

	* Makefile.am (AM_CFLAGS): Include LLVM_CFLAGS.

	* mini-llvm.c: Avoid defining the __STDC_... macros if already defined.

svn path=/branches/mono-2-6/mono/; revision=148817
2009-12-21 18:46:42 +00:00
Gonzalo Paniagua Javier e5d8c57558 2009-12-21 Gonzalo Paniagua Javier <[email protected]>
* WebConnectionGroup.cs:
	* ServicePoint.cs: implemented CloseConnectionGroup().


svn path=/branches/mono-2-6/mcs/; revision=148814
2009-12-21 17:13:52 +00:00
Marek Habersack 39f355ff7d Backport r148806
svn path=/branches/mono-2-6/mcs/; revision=148807
2009-12-21 14:27:37 +00:00
Rolf Bjarne Kvinge a2eb9c3486 In mono/metadata:
2009-12-18  Dimitar Dobrev  <[email protected]>

	* culture-info-tables.h: regenerated it to include the Georgian culture.

In tools/locale-builder:
2009-12-18  Dimitar Dobrev  <[email protected]>

	* langs/ka.xml: added a file with the settings of the neutral
	Georgian culture
	* locales/ka-GE.xml: added a file with the settings of the
	specific Georgian culture
	* supp/ka-GE.xml: added a file with the date and time formats
	of the Georgian culture
	* lcids.xml: added entries for the neutral and specific
	Georgian culture
	* Makefile.am: included supp/ka-GE.xml in the build and dist the new
	we're not downloading from primates.ximian.com.

	[Fixes bug 564910].
	[Backport of r148776].

svn path=/branches/mono-2-6/mono/; revision=148803
2009-12-21 12:12:02 +00:00
Michael Barker 4043c68978 2009-12-19 Michael Barker <[email protected]>
* Added stripped xml to avoid licensing issues.

svn path=/branches/mono-2-6/mcs/; revision=148796
2009-12-20 21:44:40 +00:00
Zoltan Varga b9bbc51c89 In System:
2009-12-19  Zoltan Varga  <[email protected]>

	* String.cs: Fix the various IndexOf and LastIndexOf methods so they handle
	"" and a non-zero startIndex correctly. Fixes #566106.

In Test/System:

2009-12-19  Zoltan Varga  <[email protected]>

	* StringTest.cs: Add tests for IndexOf ("", startIndex, count).

svn path=/branches/mono-2-6/mcs/; revision=148790
2009-12-19 21:23:08 +00:00
Jérémie Laval 0a27db5933 2009-11-02 Jérémie Laval <[email protected]>
In class/corlib/System.Threading/:
   * Parallel.cs: Added fix for Bug #536919.

In class/corlib/Test/System.Threading/:
   * ParallelTests.cs: Added unit test for Bug #536919, cleaned up.

svn path=/branches/mono-2-6/mcs/; revision=148782
2009-12-19 10:46:55 +00:00
Jonathan Pryor bf7b65723d * src/**/*: Sync with DbLinq r1294. This is DbLinq 0.19. Fixes
DataContext.Transaction.

svn path=/branches/mono-2-6/mcs/; revision=148774
2009-12-18 20:54:31 +00:00
Zoltan Varga 03905de06b 2009-12-18 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_get_argument_info): Allocate memory for CallInfo using
	alloca as g_malloc is not signal safe.

svn path=/branches/mono-2-6/mono/; revision=148767
2009-12-18 17:36:49 +00:00
Zoltan Varga 2abe570213 2009-12-18 Zoltan Varga <[email protected]>
* reflection.c (mono_reflection_get_type_internal_dynamic): Use assembly->domain
	instead of the current domain, since the two might not match if this is called
	from the debugger.

	* metadata-internals.h (MonoDynamicAssembly): Add a 'domain' field to specify the
	domain which created this assembly.

svn path=/branches/mono-2-6/mono/; revision=148759
2009-12-18 15:36:14 +00:00
Marek Habersack bd3f49a9f0 Backport of r148743
svn path=/branches/mono-2-6/mcs/; revision=148744
2009-12-18 11:07:55 +00:00
Marek Habersack 0950f336bb Backport of r148741
svn path=/branches/mono-2-6/mcs/; revision=148742
2009-12-18 09:46:17 +00:00
Atsushi Eno f9fd0ae689 2009-12-18 Atsushi Enomoto <[email protected]>
* I18N.CJK.Test.cs : add NET_2_0 condition. fix 1.1 test.


svn path=/branches/mono-2-6/mcs/; revision=148739
2009-12-18 05:05:21 +00:00
Sebastien Pouliot 3a989e7d01 backport r148706
svn path=/branches/mono-2-6/mcs/; revision=148707
2009-12-17 15:31:21 +00:00
Atsushi Eno 82f0bcaa7d Fix 1.1 build (previous test was 2.0-only, so it couldn't be simply backported).
svn path=/branches/mono-2-6/mcs/; revision=148705
2009-12-17 14:53:39 +00:00
Marek Habersack 3e13cdf770 Backport of r148697
svn path=/branches/mono-2-6/mono/; revision=148698
2009-12-17 12:38:03 +00:00
Rodrigo Kumpera 80fa10b7c6 In .:
2009-12-17  Rodrigo Kumpera  <[email protected]>

	* icall.c (ves_icall_Type_GetMethodsByName): Don't pin virtual methods if they are newslot.
	A private virtual newslot method is used to implement an interface method without exposing
	it to users. When querying for public instance methods, such method would hide a public one
	on a parent type.

	Fixes #564379.

	Backport of r148694.


svn path=/branches/mono-2-6/mono/; revision=148695
2009-12-17 12:08:05 +00:00
Zoltan Varga a381edd354 2009-12-17 Zoltan Varga <[email protected]>
* libtest.c pinvoke2.cs: Add a test for calling pinvoke methods using calli.

svn path=/branches/mono-2-6/mono/; revision=148684
2009-12-17 09:33:02 +00:00
Zoltan Varga ca08e5c579 2009-12-17 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir): Add support for CALLI with unmanaged
	signatures. Fixes #565143.

	* jit-icalls.c (mono_get_native_calli_wrapper): New JIT icall.

svn path=/branches/mono-2-6/mono/; revision=148683
2009-12-17 09:32:55 +00:00
Zoltan Varga d2e06609db 2009-12-17 Zoltan Varga <[email protected]>
* reflection.c (resolve_object): Fix the encoding of unmanaged calling
	conventions.

svn path=/branches/mono-2-6/mono/; revision=148682
2009-12-17 09:32:48 +00:00
Chris Toshok 31af90c154 revert this, as we need to figure out a better versioning scheme
svn path=/branches/moon/moon-2-0/mono/; revision=148647
2009-12-17 04:17:23 +00:00
Chris Toshok 4827009bbe rename this module so we get the right tarball names when we dist
svn path=/branches/moon/moon-2-0/mono/; revision=148628
2009-12-17 02:31:19 +00:00
Andrew Jorgensen 687ccd9db7 bump version
svn path=/branches/mono-2-6/mono/; revision=148609
2009-12-16 22:54:42 +00:00
Miguel de Icaza 36511ffde8 Fix
svn path=/branches/mono-2-6/mcs/; revision=148608
2009-12-16 22:44:42 +00:00
Miguel de Icaza acf33df432 Attempt to fix 'var foo = bar<TAB>' crash
svn path=/branches/mono-2-6/mcs/; revision=148604
2009-12-16 22:20:06 +00:00
Miguel de Icaza ac7a364349 2009-12-16 Miguel de Icaza <[email protected]>
* repl.cs: Avoid crash, fixes 554898

svn path=/branches/mono-2-6/mcs/; revision=148598
2009-12-16 22:17:19 +00:00
Miguel de Icaza b893812701 Backport
svn path=/branches/mono-2-6/mcs/; revision=148597
2009-12-16 22:01:54 +00:00
Gonzalo Paniagua Javier ee8c48257c 2009-12-16 Gonzalo Paniagua Javier <[email protected]>
* zlib-helper.c: when finishing uncompressing a buffer, we might need
	more than one call to deflate with Z_FINISH since the uncompressed
	data can take more space than the allocated buffer.

	Fixes the IPY+Chiron test case.


svn path=/branches/mono-2-6/mono/; revision=148593
2009-12-16 21:43:44 +00:00
Rodrigo Kumpera 90c08d2298 In .:
* reflection.c (mono_type_get_object): Guard against NULL generic param owner.

2009-12-16  Rodrigo Kumpera  <[email protected]>


svn path=/branches/mono-2-6/mono/; revision=148585
2009-12-16 21:16:21 +00:00
Rodrigo Kumpera 0c85600a76 In .:
2009-12-16  Rodrigo Kumpera  <[email protected]>

	* reflection.c (mono_type_get_object): If the type is VAR or MVAR check
	if the owner class has not been finished before returning reflection_info.	

	Fixes #565127.

	Backport of r148575.


svn path=/branches/mono-2-6/mono/; revision=148579
2009-12-16 19:54:03 +00:00
Rodrigo Kumpera 9b196c5cd1 In .:
2009-12-16 Rodrigo Kumpera  <[email protected]>

	* mini-x86.h: Forgot to add a 0x to MONO_ARCH_MAX_FRAME_SIZE define
	making max stack 10x smaller.

	Backport of r148570.


svn path=/branches/mono-2-6/mono/; revision=148571
2009-12-16 16:46:52 +00:00
Zoltan Varga 7f6e379dad 2009-12-16 Zoltan Varga <[email protected]>
* reflection.c (mono_custom_attrs_from_param): Avoid a crash if a dynamic
	param doesn't have custom attributes. Fixes #565117.

svn path=/branches/mono-2-6/mono/; revision=148561
2009-12-16 12:42:36 +00:00
501 changed files with 26632 additions and 22811 deletions

No files matched your search

+9
View File
@@ -1,3 +1,12 @@
2009-12-22 Geoff Norton <[email protected]>
* configure.in: Fix invalid escaping. Patch from Spina from
www.slacky.eu.
2009-12-21 Zoltan Varga <[email protected]>
* configure.in: Add an LLVM_CFLAGS automake variable.
2009-12-11 Zoltan Varga <[email protected]>
* configure.in: Applied patch from Matt McClellan ([email protected]). Add a check
+18 -3
View File
@@ -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,2.6)
AM_INIT_AUTOMAKE(mono,2.6.1)
AM_MAINTAINER_MODE
API_VER=1.0
@@ -1896,11 +1896,26 @@ if test "x$enable_llvm" = "xyes"; then
AC_MSG_ERROR([llvm-config not found.])
fi
LLVM_CXXFLAGS=`$LLVM_CONFIG --cflags`
# The output of --cflags seems to include optimizations flags too
LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'`
LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags`
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen`
LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
# Should be something like '2.6' or '2.7svn'
llvm_version=`$LLVM_CONFIG --version`
major_version=`echo $llvm_version | cut -c 1`
minor_version=`echo $llvm_version | cut -c 3`
AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries])
AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries])
# Have to pass these on the command line since mini-llvm-cpp.h already includes
# llvm's config.h
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version"
AC_SUBST(LLVM_CFLAGS)
AC_SUBST(LLVM_CXXFLAGS)
AC_SUBST(LLVM_LIBS)
AC_SUBST(LLVM_LDFLAGS)
@@ -2428,7 +2443,7 @@ if test x$platform_win32 = xyes; then
if test "x$cross_compiling" = "xno"; then
mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
else
mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\\'`\\etc
mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\'`\\etc
fi
else
mono_cfg_dir=$mono_cfg_root/etc
Binary file not shown.
+13
View File
@@ -1,3 +1,16 @@
2009-12-22 Jo Shields <[email protected]>
* HtmlAgilityPack/LICENSE: Include upstream license (Ms-PL) since the
file headers don't specify it
2009-12-22 Jo Shields <[email protected]>
* HtmlAgilityPack/*: Bundle HtmlAgilityPack 1.4~beta2 from
http://www.codeplex.com/htmlagilitypack in source form.
* AgilityPack.dll: Remove binary assembly, use source instead.
* docs.make Makefile.am README: Reflect above changes
2009-02-12 Zoltan Varga <[email protected]>
* Makefile.am (EXTRA_DIST): Remove removed files.
@@ -0,0 +1,33 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Text;
namespace HtmlAgilityPack
{
internal class EncodingFoundException : Exception
{
#region Fields
private Encoding _encoding;
#endregion
#region Constructors
internal EncodingFoundException(Encoding encoding)
{
_encoding = encoding;
}
#endregion
#region Properties
internal Encoding Encoding
{
get { return _encoding; }
}
#endregion
}
}
+260
View File
@@ -0,0 +1,260 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
#region
using System;
using System.Diagnostics;
#endregion
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an HTML attribute.
/// </summary>
[DebuggerDisplay("Name: {OriginalName}, Value: {Value}")]
public class HtmlAttribute : IComparable
{
#region Fields
private int _line;
internal int _lineposition;
internal string _name;
internal int _namelength;
internal int _namestartindex;
internal HtmlDocument _ownerdocument; // attribute can exists without a node
internal HtmlNode _ownernode;
private AttributeValueQuote _quoteType = AttributeValueQuote.DoubleQuote;
internal int _streamposition;
internal string _value;
internal int _valuelength;
internal int _valuestartindex;
#endregion
#region Constructors
internal HtmlAttribute(HtmlDocument ownerdocument)
{
_ownerdocument = ownerdocument;
}
#endregion
#region Properties
/// <summary>
/// Gets the line number of this attribute in the document.
/// </summary>
public int Line
{
get { return _line; }
internal set { _line = value; }
}
/// <summary>
/// Gets the column number of this attribute in the document.
/// </summary>
public int LinePosition
{
get { return _lineposition; }
}
/// <summary>
/// Gets the qualified name of the attribute.
/// </summary>
public string Name
{
get
{
if (_name == null)
{
_name = _ownerdocument._text.Substring(_namestartindex, _namelength);
}
return _name.ToLower();
}
set
{
if (value == null)
{
throw new ArgumentNullException("value");
}
_name = value;
if (_ownernode != null)
{
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
}
}
/// <summary>
/// Name of attribute with original case
/// </summary>
public string OriginalName
{
get { return _name; }
}
/// <summary>
/// Gets the HTML document to which this attribute belongs.
/// </summary>
public HtmlDocument OwnerDocument
{
get { return _ownerdocument; }
}
/// <summary>
/// Gets the HTML node to which this attribute belongs.
/// </summary>
public HtmlNode OwnerNode
{
get { return _ownernode; }
}
/// <summary>
/// Specifies what type of quote the data should be wrapped in
/// </summary>
public AttributeValueQuote QuoteType
{
get { return _quoteType; }
set { _quoteType = value; }
}
/// <summary>
/// Gets the stream position of this attribute in the document, relative to the start of the document.
/// </summary>
public int StreamPosition
{
get { return _streamposition; }
}
/// <summary>
/// Gets or sets the value of the attribute.
/// </summary>
public string Value
{
get
{
if (_value == null)
{
_value = _ownerdocument._text.Substring(_valuestartindex, _valuelength);
}
return _value;
}
set
{
_value = value;
if (_ownernode != null)
{
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
}
}
internal string XmlName
{
get { return HtmlDocument.GetXmlName(Name); }
}
internal string XmlValue
{
get { return Value; }
}
/// <summary>
/// Gets a valid XPath string that points to this Attribute
/// </summary>
public string XPath
{
get
{
string basePath = (OwnerNode == null) ? "/" : OwnerNode.XPath + "/";
return basePath + GetRelativeXpath();
}
}
#endregion
#region IComparable Members
/// <summary>
/// Compares the current instance with another attribute. Comparison is based on attributes' name.
/// </summary>
/// <param name="obj">An attribute to compare with this instance.</param>
/// <returns>A 32-bit signed integer that indicates the relative order of the names comparison.</returns>
public int CompareTo(object obj)
{
HtmlAttribute att = obj as HtmlAttribute;
if (att == null)
{
throw new ArgumentException("obj");
}
return Name.CompareTo(att.Name);
}
#endregion
#region Public Methods
/// <summary>
/// Creates a duplicate of this attribute.
/// </summary>
/// <returns>The cloned attribute.</returns>
public HtmlAttribute Clone()
{
HtmlAttribute att = new HtmlAttribute(_ownerdocument);
att.Name = Name;
att.Value = Value;
return att;
}
/// <summary>
/// Removes this attribute from it's parents collection
/// </summary>
public void Remove()
{
_ownernode.Attributes.Remove(this);
}
#endregion
#region Private Methods
private string GetRelativeXpath()
{
if (OwnerNode == null)
return Name;
int i = 1;
foreach (HtmlAttribute node in OwnerNode.Attributes)
{
if (node.Name != Name) continue;
if (node == this)
break;
i++;
}
return "@" + Name + "[" + i + "]";
}
#endregion
}
/// <summary>
/// An Enum representing different types of Quotes used for surrounding attribute values
/// </summary>
public enum AttributeValueQuote
{
/// <summary>
/// A single quote mark '
/// </summary>
SingleQuote,
/// <summary>
/// A double quote mark "
/// </summary>
DoubleQuote
}
}
@@ -0,0 +1,394 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
using System.Collections.Generic;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a combined list and collection of HTML nodes.
/// </summary>
public class HtmlAttributeCollection : IList<HtmlAttribute>
{
#region Fields
internal Dictionary<string, HtmlAttribute> Hashitems = new Dictionary<string, HtmlAttribute>();
private HtmlNode _ownernode;
private List<HtmlAttribute> items = new List<HtmlAttribute>();
#endregion
#region Constructors
internal HtmlAttributeCollection(HtmlNode ownernode)
{
_ownernode = ownernode;
}
#endregion
#region Properties
/// <summary>
/// Gets a given attribute from the list using its name.
/// </summary>
public HtmlAttribute this[string name]
{
get
{
if (name == null)
{
throw new ArgumentNullException("name");
}
return Hashitems.ContainsKey(name.ToLower()) ? Hashitems[name.ToLower()] : null;
}
set { Append(value); }
}
#endregion
#region IList<HtmlAttribute> Members
/// <summary>
/// Gets the number of elements actually contained in the list.
/// </summary>
public int Count
{
get { return items.Count; }
}
/// <summary>
/// Gets readonly status of colelction
/// </summary>
public bool IsReadOnly
{
get { return false; }
}
/// <summary>
/// Gets the attribute at the specified index.
/// </summary>
public HtmlAttribute this[int index]
{
get { return items[index]; }
set { items[index] = value; }
}
/// <summary>
/// Adds supplied item to collection
/// </summary>
/// <param name="item"></param>
public void Add(HtmlAttribute item)
{
Append(item);
}
/// <summary>
/// Explicit clear
/// </summary>
void ICollection<HtmlAttribute>.Clear()
{
items.Clear();
}
/// <summary>
/// Retreives existence of supplied item
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool Contains(HtmlAttribute item)
{
return items.Contains(item);
}
/// <summary>
/// Copies collection to array
/// </summary>
/// <param name="array"></param>
/// <param name="arrayIndex"></param>
public void CopyTo(HtmlAttribute[] array, int arrayIndex)
{
items.CopyTo(array, arrayIndex);
}
/// <summary>
/// Get Explicit enumerator
/// </summary>
/// <returns></returns>
IEnumerator<HtmlAttribute> IEnumerable<HtmlAttribute>.GetEnumerator()
{
return items.GetEnumerator();
}
/// <summary>
/// Explicit non-generic enumerator
/// </summary>
/// <returns></returns>
IEnumerator IEnumerable.GetEnumerator()
{
return items.GetEnumerator();
}
/// <summary>
/// Retrieves the index for the supplied item, -1 if not found
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public int IndexOf(HtmlAttribute item)
{
return items.IndexOf(item);
}
/// <summary>
/// Inserts given item into collection at supplied index
/// </summary>
/// <param name="index"></param>
/// <param name="item"></param>
public void Insert(int index, HtmlAttribute item)
{
if (item == null)
{
throw new ArgumentNullException("item");
}
Hashitems[item.Name] = item;
item._ownernode = _ownernode;
items.Insert(index, item);
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
/// <summary>
/// Explicit collection remove
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
bool ICollection<HtmlAttribute>.Remove(HtmlAttribute item)
{
return items.Remove(item);
}
/// <summary>
/// Removes the attribute at the specified index.
/// </summary>
/// <param name="index">The index of the attribute to remove.</param>
public void RemoveAt(int index)
{
HtmlAttribute att = items[index];
Hashitems.Remove(att.Name);
items.RemoveAt(index);
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
#endregion
#region Public Methods
/// <summary>
/// Adds a new attribute to the collection with the given values
/// </summary>
/// <param name="name"></param>
/// <param name="value"></param>
public void Add(string name, string value)
{
Append(name, value);
}
/// <summary>
/// Inserts the specified attribute as the last attribute in the collection.
/// </summary>
/// <param name="newAttribute">The attribute to insert. May not be null.</param>
/// <returns>The appended attribute.</returns>
public HtmlAttribute Append(HtmlAttribute newAttribute)
{
if (newAttribute == null)
{
throw new ArgumentNullException("newAttribute");
}
Hashitems[newAttribute.Name] = newAttribute;
newAttribute._ownernode = _ownernode;
items.Add(newAttribute);
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
return newAttribute;
}
/// <summary>
/// Creates and inserts a new attribute as the last attribute in the collection.
/// </summary>
/// <param name="name">The name of the attribute to insert.</param>
/// <returns>The appended attribute.</returns>
public HtmlAttribute Append(string name)
{
HtmlAttribute att = _ownernode._ownerdocument.CreateAttribute(name);
return Append(att);
}
/// <summary>
/// Creates and inserts a new attribute as the last attribute in the collection.
/// </summary>
/// <param name="name">The name of the attribute to insert.</param>
/// <param name="value">The value of the attribute to insert.</param>
/// <returns>The appended attribute.</returns>
public HtmlAttribute Append(string name, string value)
{
HtmlAttribute att = _ownernode._ownerdocument.CreateAttribute(name, value);
return Append(att);
}
/// <summary>
/// Checks for existance of attribute with given name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public bool Contains(string name)
{
for (int i = 0; i < items.Count; i++)
{
if (items[i].Name.Equals(name.ToLower()))
return true;
}
return false;
}
/// <summary>
/// Inserts the specified attribute as the first node in the collection.
/// </summary>
/// <param name="newAttribute">The attribute to insert. May not be null.</param>
/// <returns>The prepended attribute.</returns>
public HtmlAttribute Prepend(HtmlAttribute newAttribute)
{
Insert(0, newAttribute);
return newAttribute;
}
/// <summary>
/// Removes a given attribute from the list.
/// </summary>
/// <param name="attribute">The attribute to remove. May not be null.</param>
public void Remove(HtmlAttribute attribute)
{
if (attribute == null)
{
throw new ArgumentNullException("attribute");
}
int index = GetAttributeIndex(attribute);
if (index == -1)
{
throw new IndexOutOfRangeException();
}
RemoveAt(index);
}
/// <summary>
/// Removes an attribute from the list, using its name. If there are more than one attributes with this name, they will all be removed.
/// </summary>
/// <param name="name">The attribute's name. May not be null.</param>
public void Remove(string name)
{
if (name == null)
{
throw new ArgumentNullException("name");
}
string lname = name.ToLower();
for (int i = 0; i < items.Count; i++)
{
HtmlAttribute att = items[i];
if (att.Name == lname)
{
RemoveAt(i);
}
}
}
/// <summary>
/// Remove all attributes in the list.
/// </summary>
public void RemoveAll()
{
Hashitems.Clear();
items.Clear();
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
#endregion
#region LINQ Methods
/// <summary>
/// Returns all attributes with specified name. Handles case insentivity
/// </summary>
/// <param name="attributeName">Name of the attribute</param>
/// <returns></returns>
public IEnumerable<HtmlAttribute> AttributesWithName(string attributeName)
{
attributeName = attributeName.ToLower();
for (int i = 0; i < items.Count; i++)
{
if (items[i].Name.Equals(attributeName))
yield return items[i];
}
}
/// <summary>
/// Removes all attributes from the collection
/// </summary>
public void Remove()
{
foreach (HtmlAttribute item in items)
item.Remove();
}
#endregion
#region Internal Methods
/// <summary>
/// Clears the attribute collection
/// </summary>
internal void Clear()
{
Hashitems.Clear();
items.Clear();
}
internal int GetAttributeIndex(HtmlAttribute attribute)
{
if (attribute == null)
{
throw new ArgumentNullException("attribute");
}
for (int i = 0; i < items.Count; i++)
{
if ((items[i]) == attribute)
return i;
}
return -1;
}
internal int GetAttributeIndex(string name)
{
if (name == null)
{
throw new ArgumentNullException("name");
}
string lname = name.ToLower();
for (int i = 0; i < items.Count; i++)
{
if ((items[i]).Name == lname)
return i;
}
return -1;
}
#endregion
}
}
+142
View File
@@ -0,0 +1,142 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
namespace HtmlAgilityPack
{
internal class HtmlCmdLine
{
#region Static Members
internal static bool Help;
#endregion
#region Constructors
static HtmlCmdLine()
{
Help = false;
ParseArgs();
}
#endregion
#region Internal Methods
internal static string GetOption(string name, string def)
{
string p = def;
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
GetStringArg(args[i], name, ref p);
}
return p;
}
internal static string GetOption(int index, string def)
{
string p = def;
string[] args = Environment.GetCommandLineArgs();
int j = 0;
for (int i = 1; i < args.Length; i++)
{
if (GetStringArg(args[i], ref p))
{
if (index == j)
return p;
else
p = def;
j++;
}
}
return p;
}
internal static bool GetOption(string name, bool def)
{
bool p = def;
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
GetBoolArg(args[i], name, ref p);
}
return p;
}
internal static int GetOption(string name, int def)
{
int p = def;
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
GetIntArg(args[i], name, ref p);
}
return p;
}
#endregion
#region Private Methods
private static void GetBoolArg(string Arg, string Name, ref bool ArgValue)
{
if (Arg.Length < (Name.Length + 1)) // -name is 1 more than name
return;
if (('/' != Arg[0]) && ('-' != Arg[0])) // not a param
return;
if (Arg.Substring(1, Name.Length).ToLower() == Name.ToLower())
ArgValue = true;
}
private static void GetIntArg(string Arg, string Name, ref int ArgValue)
{
if (Arg.Length < (Name.Length + 3)) // -name:12 is 3 more than name
return;
if (('/' != Arg[0]) && ('-' != Arg[0])) // not a param
return;
if (Arg.Substring(1, Name.Length).ToLower() == Name.ToLower())
{
try
{
ArgValue = Convert.ToInt32(Arg.Substring(Name.Length + 2, Arg.Length - Name.Length - 2));
}
catch
{
}
}
}
private static bool GetStringArg(string Arg, ref string ArgValue)
{
if (('/' == Arg[0]) || ('-' == Arg[0]))
return false;
ArgValue = Arg;
return true;
}
private static void GetStringArg(string Arg, string Name, ref string ArgValue)
{
if (Arg.Length < (Name.Length + 3)) // -name:x is 3 more than name
return;
if (('/' != Arg[0]) && ('-' != Arg[0])) // not a param
return;
if (Arg.Substring(1, Name.Length).ToLower() == Name.ToLower())
ArgValue = Arg.Substring(Name.Length + 2, Arg.Length - Name.Length - 2);
}
private static void ParseArgs()
{
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
// help
GetBoolArg(args[i], "?", ref Help);
GetBoolArg(args[i], "h", ref Help);
GetBoolArg(args[i], "help", ref Help);
}
}
#endregion
}
}
+76
View File
@@ -0,0 +1,76 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an HTML comment.
/// </summary>
public class HtmlCommentNode : HtmlNode
{
#region Fields
private string _comment;
#endregion
#region Constructors
internal HtmlCommentNode(HtmlDocument ownerdocument, int index)
:
base(HtmlNodeType.Comment, ownerdocument, index)
{
}
#endregion
#region Properties
/// <summary>
/// Gets or Sets the comment text of the node.
/// </summary>
public string Comment
{
get
{
if (_comment == null)
{
return base.InnerHtml;
}
return _comment;
}
set { _comment = value; }
}
/// <summary>
/// Gets or Sets the HTML between the start and end tags of the object. In the case of a text node, it is equals to OuterHtml.
/// </summary>
public override string InnerHtml
{
get
{
if (_comment == null)
{
return base.InnerHtml;
}
return _comment;
}
set { _comment = value; }
}
/// <summary>
/// Gets or Sets the object and its content in HTML.
/// </summary>
public override string OuterHtml
{
get
{
if (_comment == null)
{
return base.OuterHtml;
}
return "<!--" + _comment + "-->";
}
}
#endregion
}
}
@@ -0,0 +1,33 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Diagnostics;
namespace HtmlAgilityPack
{
internal class HtmlConsoleListener : TraceListener
{
#region Public Methods
public override void Write(string Message)
{
Write(Message, "");
}
public override void Write(string Message, string Category)
{
Console.Write("T:" + Category + ": " + Message);
}
public override void WriteLine(string Message)
{
Write(Message + "\n");
}
public override void WriteLine(string Message, string Category)
{
Write(Message + "\n", Category);
}
#endregion
}
}
File diff suppressed because it is too large. Load diff
+32
View File
@@ -0,0 +1,32 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
namespace HtmlAgilityPack
{
/// <summary>
/// Flags that describe the behavior of an Element node.
/// </summary>
[Flags]
public enum HtmlElementFlag
{
/// <summary>
/// The node is a CDATA node.
/// </summary>
CData = 1,
/// <summary>
/// The node is empty. META or IMG are example of such nodes.
/// </summary>
Empty = 2,
/// <summary>
/// The node will automatically be closed during parsing.
/// </summary>
Closed = 4,
/// <summary>
/// The node can overlap.
/// </summary>
CanOverlap = 8
}
}
+826
View File
@@ -0,0 +1,826 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
using System.Text;
namespace HtmlAgilityPack
{
/// <summary>
/// A utility class to replace special characters by entities and vice-versa.
/// Follows HTML 4.0 specification found at http://www.w3.org/TR/html4/sgml/entities.html
/// </summary>
public class HtmlEntity
{
#region Static Members
private static readonly int _maxEntitySize;
private static Hashtable _entityName;
private static Hashtable _entityValue;
/// <summary>
/// A collection of entities indexed by name.
/// </summary>
public static Hashtable EntityName
{
get { return _entityName; }
}
/// <summary>
/// A collection of entities indexed by value.
/// </summary>
public static Hashtable EntityValue
{
get { return _entityValue; }
}
#endregion
#region Constructors
static HtmlEntity()
{
_entityName = new Hashtable();
_entityValue = new Hashtable();
#region Entities Definition
_entityValue.Add("nbsp", 160); // no-break space = non-breaking space, U+00A0 ISOnum
_entityName.Add(160, "nbsp");
_entityValue.Add("iexcl", 161); // inverted exclamation mark, U+00A1 ISOnum
_entityName.Add(161, "iexcl");
_entityValue.Add("cent", 162); // cent sign, U+00A2 ISOnum
_entityName.Add(162, "cent");
_entityValue.Add("pound", 163); // pound sign, U+00A3 ISOnum
_entityName.Add(163, "pound");
_entityValue.Add("curren", 164); // currency sign, U+00A4 ISOnum
_entityName.Add(164, "curren");
_entityValue.Add("yen", 165); // yen sign = yuan sign, U+00A5 ISOnum
_entityName.Add(165, "yen");
_entityValue.Add("brvbar", 166); // broken bar = broken vertical bar, U+00A6 ISOnum
_entityName.Add(166, "brvbar");
_entityValue.Add("sect", 167); // section sign, U+00A7 ISOnum
_entityName.Add(167, "sect");
_entityValue.Add("uml", 168); // diaeresis = spacing diaeresis, U+00A8 ISOdia
_entityName.Add(168, "uml");
_entityValue.Add("copy", 169); // copyright sign, U+00A9 ISOnum
_entityName.Add(169, "copy");
_entityValue.Add("ordf", 170); // feminine ordinal indicator, U+00AA ISOnum
_entityName.Add(170, "ordf");
_entityValue.Add("laquo", 171);
// left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
_entityName.Add(171, "laquo");
_entityValue.Add("not", 172); // not sign, U+00AC ISOnum
_entityName.Add(172, "not");
_entityValue.Add("shy", 173); // soft hyphen = discretionary hyphen, U+00AD ISOnum
_entityName.Add(173, "shy");
_entityValue.Add("reg", 174); // registered sign = registered trade mark sign, U+00AE ISOnum
_entityName.Add(174, "reg");
_entityValue.Add("macr", 175); // macron = spacing macron = overline = APL overbar, U+00AF ISOdia
_entityName.Add(175, "macr");
_entityValue.Add("deg", 176); // degree sign, U+00B0 ISOnum
_entityName.Add(176, "deg");
_entityValue.Add("plusmn", 177); // plus-minus sign = plus-or-minus sign, U+00B1 ISOnum
_entityName.Add(177, "plusmn");
_entityValue.Add("sup2", 178); // superscript two = superscript digit two = squared, U+00B2 ISOnum
_entityName.Add(178, "sup2");
_entityValue.Add("sup3", 179); // superscript three = superscript digit three = cubed, U+00B3 ISOnum
_entityName.Add(179, "sup3");
_entityValue.Add("acute", 180); // acute accent = spacing acute, U+00B4 ISOdia
_entityName.Add(180, "acute");
_entityValue.Add("micro", 181); // micro sign, U+00B5 ISOnum
_entityName.Add(181, "micro");
_entityValue.Add("para", 182); // pilcrow sign = paragraph sign, U+00B6 ISOnum
_entityName.Add(182, "para");
_entityValue.Add("middot", 183); // middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum
_entityName.Add(183, "middot");
_entityValue.Add("cedil", 184); // cedilla = spacing cedilla, U+00B8 ISOdia
_entityName.Add(184, "cedil");
_entityValue.Add("sup1", 185); // superscript one = superscript digit one, U+00B9 ISOnum
_entityName.Add(185, "sup1");
_entityValue.Add("ordm", 186); // masculine ordinal indicator, U+00BA ISOnum
_entityName.Add(186, "ordm");
_entityValue.Add("raquo", 187);
// right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
_entityName.Add(187, "raquo");
_entityValue.Add("frac14", 188); // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
_entityName.Add(188, "frac14");
_entityValue.Add("frac12", 189); // vulgar fraction one half = fraction one half, U+00BD ISOnum
_entityName.Add(189, "frac12");
_entityValue.Add("frac34", 190); // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
_entityName.Add(190, "frac34");
_entityValue.Add("iquest", 191); // inverted question mark = turned question mark, U+00BF ISOnum
_entityName.Add(191, "iquest");
_entityValue.Add("Agrave", 192);
// latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
_entityName.Add(192, "Agrave");
_entityValue.Add("Aacute", 193); // latin capital letter A with acute, U+00C1 ISOlat1
_entityName.Add(193, "Aacute");
_entityValue.Add("Acirc", 194); // latin capital letter A with circumflex, U+00C2 ISOlat1
_entityName.Add(194, "Acirc");
_entityValue.Add("Atilde", 195); // latin capital letter A with tilde, U+00C3 ISOlat1
_entityName.Add(195, "Atilde");
_entityValue.Add("Auml", 196); // latin capital letter A with diaeresis, U+00C4 ISOlat1
_entityName.Add(196, "Auml");
_entityValue.Add("Aring", 197);
// latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
_entityName.Add(197, "Aring");
_entityValue.Add("AElig", 198); // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
_entityName.Add(198, "AElig");
_entityValue.Add("Ccedil", 199); // latin capital letter C with cedilla, U+00C7 ISOlat1
_entityName.Add(199, "Ccedil");
_entityValue.Add("Egrave", 200); // latin capital letter E with grave, U+00C8 ISOlat1
_entityName.Add(200, "Egrave");
_entityValue.Add("Eacute", 201); // latin capital letter E with acute, U+00C9 ISOlat1
_entityName.Add(201, "Eacute");
_entityValue.Add("Ecirc", 202); // latin capital letter E with circumflex, U+00CA ISOlat1
_entityName.Add(202, "Ecirc");
_entityValue.Add("Euml", 203); // latin capital letter E with diaeresis, U+00CB ISOlat1
_entityName.Add(203, "Euml");
_entityValue.Add("Igrave", 204); // latin capital letter I with grave, U+00CC ISOlat1
_entityName.Add(204, "Igrave");
_entityValue.Add("Iacute", 205); // latin capital letter I with acute, U+00CD ISOlat1
_entityName.Add(205, "Iacute");
_entityValue.Add("Icirc", 206); // latin capital letter I with circumflex, U+00CE ISOlat1
_entityName.Add(206, "Icirc");
_entityValue.Add("Iuml", 207); // latin capital letter I with diaeresis, U+00CF ISOlat1
_entityName.Add(207, "Iuml");
_entityValue.Add("ETH", 208); // latin capital letter ETH, U+00D0 ISOlat1
_entityName.Add(208, "ETH");
_entityValue.Add("Ntilde", 209); // latin capital letter N with tilde, U+00D1 ISOlat1
_entityName.Add(209, "Ntilde");
_entityValue.Add("Ograve", 210); // latin capital letter O with grave, U+00D2 ISOlat1
_entityName.Add(210, "Ograve");
_entityValue.Add("Oacute", 211); // latin capital letter O with acute, U+00D3 ISOlat1
_entityName.Add(211, "Oacute");
_entityValue.Add("Ocirc", 212); // latin capital letter O with circumflex, U+00D4 ISOlat1
_entityName.Add(212, "Ocirc");
_entityValue.Add("Otilde", 213); // latin capital letter O with tilde, U+00D5 ISOlat1
_entityName.Add(213, "Otilde");
_entityValue.Add("Ouml", 214); // latin capital letter O with diaeresis, U+00D6 ISOlat1
_entityName.Add(214, "Ouml");
_entityValue.Add("times", 215); // multiplication sign, U+00D7 ISOnum
_entityName.Add(215, "times");
_entityValue.Add("Oslash", 216);
// latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
_entityName.Add(216, "Oslash");
_entityValue.Add("Ugrave", 217); // latin capital letter U with grave, U+00D9 ISOlat1
_entityName.Add(217, "Ugrave");
_entityValue.Add("Uacute", 218); // latin capital letter U with acute, U+00DA ISOlat1
_entityName.Add(218, "Uacute");
_entityValue.Add("Ucirc", 219); // latin capital letter U with circumflex, U+00DB ISOlat1
_entityName.Add(219, "Ucirc");
_entityValue.Add("Uuml", 220); // latin capital letter U with diaeresis, U+00DC ISOlat1
_entityName.Add(220, "Uuml");
_entityValue.Add("Yacute", 221); // latin capital letter Y with acute, U+00DD ISOlat1
_entityName.Add(221, "Yacute");
_entityValue.Add("THORN", 222); // latin capital letter THORN, U+00DE ISOlat1
_entityName.Add(222, "THORN");
_entityValue.Add("szlig", 223); // latin small letter sharp s = ess-zed, U+00DF ISOlat1
_entityName.Add(223, "szlig");
_entityValue.Add("agrave", 224);
// latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
_entityName.Add(224, "agrave");
_entityValue.Add("aacute", 225); // latin small letter a with acute, U+00E1 ISOlat1
_entityName.Add(225, "aacute");
_entityValue.Add("acirc", 226); // latin small letter a with circumflex, U+00E2 ISOlat1
_entityName.Add(226, "acirc");
_entityValue.Add("atilde", 227); // latin small letter a with tilde, U+00E3 ISOlat1
_entityName.Add(227, "atilde");
_entityValue.Add("auml", 228); // latin small letter a with diaeresis, U+00E4 ISOlat1
_entityName.Add(228, "auml");
_entityValue.Add("aring", 229);
// latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
_entityName.Add(229, "aring");
_entityValue.Add("aelig", 230); // latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
_entityName.Add(230, "aelig");
_entityValue.Add("ccedil", 231); // latin small letter c with cedilla, U+00E7 ISOlat1
_entityName.Add(231, "ccedil");
_entityValue.Add("egrave", 232); // latin small letter e with grave, U+00E8 ISOlat1
_entityName.Add(232, "egrave");
_entityValue.Add("eacute", 233); // latin small letter e with acute, U+00E9 ISOlat1
_entityName.Add(233, "eacute");
_entityValue.Add("ecirc", 234); // latin small letter e with circumflex, U+00EA ISOlat1
_entityName.Add(234, "ecirc");
_entityValue.Add("euml", 235); // latin small letter e with diaeresis, U+00EB ISOlat1
_entityName.Add(235, "euml");
_entityValue.Add("igrave", 236); // latin small letter i with grave, U+00EC ISOlat1
_entityName.Add(236, "igrave");
_entityValue.Add("iacute", 237); // latin small letter i with acute, U+00ED ISOlat1
_entityName.Add(237, "iacute");
_entityValue.Add("icirc", 238); // latin small letter i with circumflex, U+00EE ISOlat1
_entityName.Add(238, "icirc");
_entityValue.Add("iuml", 239); // latin small letter i with diaeresis, U+00EF ISOlat1
_entityName.Add(239, "iuml");
_entityValue.Add("eth", 240); // latin small letter eth, U+00F0 ISOlat1
_entityName.Add(240, "eth");
_entityValue.Add("ntilde", 241); // latin small letter n with tilde, U+00F1 ISOlat1
_entityName.Add(241, "ntilde");
_entityValue.Add("ograve", 242); // latin small letter o with grave, U+00F2 ISOlat1
_entityName.Add(242, "ograve");
_entityValue.Add("oacute", 243); // latin small letter o with acute, U+00F3 ISOlat1
_entityName.Add(243, "oacute");
_entityValue.Add("ocirc", 244); // latin small letter o with circumflex, U+00F4 ISOlat1
_entityName.Add(244, "ocirc");
_entityValue.Add("otilde", 245); // latin small letter o with tilde, U+00F5 ISOlat1
_entityName.Add(245, "otilde");
_entityValue.Add("ouml", 246); // latin small letter o with diaeresis, U+00F6 ISOlat1
_entityName.Add(246, "ouml");
_entityValue.Add("divide", 247); // division sign, U+00F7 ISOnum
_entityName.Add(247, "divide");
_entityValue.Add("oslash", 248);
// latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
_entityName.Add(248, "oslash");
_entityValue.Add("ugrave", 249); // latin small letter u with grave, U+00F9 ISOlat1
_entityName.Add(249, "ugrave");
_entityValue.Add("uacute", 250); // latin small letter u with acute, U+00FA ISOlat1
_entityName.Add(250, "uacute");
_entityValue.Add("ucirc", 251); // latin small letter u with circumflex, U+00FB ISOlat1
_entityName.Add(251, "ucirc");
_entityValue.Add("uuml", 252); // latin small letter u with diaeresis, U+00FC ISOlat1
_entityName.Add(252, "uuml");
_entityValue.Add("yacute", 253); // latin small letter y with acute, U+00FD ISOlat1
_entityName.Add(253, "yacute");
_entityValue.Add("thorn", 254); // latin small letter thorn, U+00FE ISOlat1
_entityName.Add(254, "thorn");
_entityValue.Add("yuml", 255); // latin small letter y with diaeresis, U+00FF ISOlat1
_entityName.Add(255, "yuml");
_entityValue.Add("fnof", 402); // latin small f with hook = function = florin, U+0192 ISOtech
_entityName.Add(402, "fnof");
_entityValue.Add("Alpha", 913); // greek capital letter alpha, U+0391
_entityName.Add(913, "Alpha");
_entityValue.Add("Beta", 914); // greek capital letter beta, U+0392
_entityName.Add(914, "Beta");
_entityValue.Add("Gamma", 915); // greek capital letter gamma, U+0393 ISOgrk3
_entityName.Add(915, "Gamma");
_entityValue.Add("Delta", 916); // greek capital letter delta, U+0394 ISOgrk3
_entityName.Add(916, "Delta");
_entityValue.Add("Epsilon", 917); // greek capital letter epsilon, U+0395
_entityName.Add(917, "Epsilon");
_entityValue.Add("Zeta", 918); // greek capital letter zeta, U+0396
_entityName.Add(918, "Zeta");
_entityValue.Add("Eta", 919); // greek capital letter eta, U+0397
_entityName.Add(919, "Eta");
_entityValue.Add("Theta", 920); // greek capital letter theta, U+0398 ISOgrk3
_entityName.Add(920, "Theta");
_entityValue.Add("Iota", 921); // greek capital letter iota, U+0399
_entityName.Add(921, "Iota");
_entityValue.Add("Kappa", 922); // greek capital letter kappa, U+039A
_entityName.Add(922, "Kappa");
_entityValue.Add("Lambda", 923); // greek capital letter lambda, U+039B ISOgrk3
_entityName.Add(923, "Lambda");
_entityValue.Add("Mu", 924); // greek capital letter mu, U+039C
_entityName.Add(924, "Mu");
_entityValue.Add("Nu", 925); // greek capital letter nu, U+039D
_entityName.Add(925, "Nu");
_entityValue.Add("Xi", 926); // greek capital letter xi, U+039E ISOgrk3
_entityName.Add(926, "Xi");
_entityValue.Add("Omicron", 927); // greek capital letter omicron, U+039F
_entityName.Add(927, "Omicron");
_entityValue.Add("Pi", 928); // greek capital letter pi, U+03A0 ISOgrk3
_entityName.Add(928, "Pi");
_entityValue.Add("Rho", 929); // greek capital letter rho, U+03A1
_entityName.Add(929, "Rho");
_entityValue.Add("Sigma", 931); // greek capital letter sigma, U+03A3 ISOgrk3
_entityName.Add(931, "Sigma");
_entityValue.Add("Tau", 932); // greek capital letter tau, U+03A4
_entityName.Add(932, "Tau");
_entityValue.Add("Upsilon", 933); // greek capital letter upsilon, U+03A5 ISOgrk3
_entityName.Add(933, "Upsilon");
_entityValue.Add("Phi", 934); // greek capital letter phi, U+03A6 ISOgrk3
_entityName.Add(934, "Phi");
_entityValue.Add("Chi", 935); // greek capital letter chi, U+03A7
_entityName.Add(935, "Chi");
_entityValue.Add("Psi", 936); // greek capital letter psi, U+03A8 ISOgrk3
_entityName.Add(936, "Psi");
_entityValue.Add("Omega", 937); // greek capital letter omega, U+03A9 ISOgrk3
_entityName.Add(937, "Omega");
_entityValue.Add("alpha", 945); // greek small letter alpha, U+03B1 ISOgrk3
_entityName.Add(945, "alpha");
_entityValue.Add("beta", 946); // greek small letter beta, U+03B2 ISOgrk3
_entityName.Add(946, "beta");
_entityValue.Add("gamma", 947); // greek small letter gamma, U+03B3 ISOgrk3
_entityName.Add(947, "gamma");
_entityValue.Add("delta", 948); // greek small letter delta, U+03B4 ISOgrk3
_entityName.Add(948, "delta");
_entityValue.Add("epsilon", 949); // greek small letter epsilon, U+03B5 ISOgrk3
_entityName.Add(949, "epsilon");
_entityValue.Add("zeta", 950); // greek small letter zeta, U+03B6 ISOgrk3
_entityName.Add(950, "zeta");
_entityValue.Add("eta", 951); // greek small letter eta, U+03B7 ISOgrk3
_entityName.Add(951, "eta");
_entityValue.Add("theta", 952); // greek small letter theta, U+03B8 ISOgrk3
_entityName.Add(952, "theta");
_entityValue.Add("iota", 953); // greek small letter iota, U+03B9 ISOgrk3
_entityName.Add(953, "iota");
_entityValue.Add("kappa", 954); // greek small letter kappa, U+03BA ISOgrk3
_entityName.Add(954, "kappa");
_entityValue.Add("lambda", 955); // greek small letter lambda, U+03BB ISOgrk3
_entityName.Add(955, "lambda");
_entityValue.Add("mu", 956); // greek small letter mu, U+03BC ISOgrk3
_entityName.Add(956, "mu");
_entityValue.Add("nu", 957); // greek small letter nu, U+03BD ISOgrk3
_entityName.Add(957, "nu");
_entityValue.Add("xi", 958); // greek small letter xi, U+03BE ISOgrk3
_entityName.Add(958, "xi");
_entityValue.Add("omicron", 959); // greek small letter omicron, U+03BF NEW
_entityName.Add(959, "omicron");
_entityValue.Add("pi", 960); // greek small letter pi, U+03C0 ISOgrk3
_entityName.Add(960, "pi");
_entityValue.Add("rho", 961); // greek small letter rho, U+03C1 ISOgrk3
_entityName.Add(961, "rho");
_entityValue.Add("sigmaf", 962); // greek small letter final sigma, U+03C2 ISOgrk3
_entityName.Add(962, "sigmaf");
_entityValue.Add("sigma", 963); // greek small letter sigma, U+03C3 ISOgrk3
_entityName.Add(963, "sigma");
_entityValue.Add("tau", 964); // greek small letter tau, U+03C4 ISOgrk3
_entityName.Add(964, "tau");
_entityValue.Add("upsilon", 965); // greek small letter upsilon, U+03C5 ISOgrk3
_entityName.Add(965, "upsilon");
_entityValue.Add("phi", 966); // greek small letter phi, U+03C6 ISOgrk3
_entityName.Add(966, "phi");
_entityValue.Add("chi", 967); // greek small letter chi, U+03C7 ISOgrk3
_entityName.Add(967, "chi");
_entityValue.Add("psi", 968); // greek small letter psi, U+03C8 ISOgrk3
_entityName.Add(968, "psi");
_entityValue.Add("omega", 969); // greek small letter omega, U+03C9 ISOgrk3
_entityName.Add(969, "omega");
_entityValue.Add("thetasym", 977); // greek small letter theta symbol, U+03D1 NEW
_entityName.Add(977, "thetasym");
_entityValue.Add("upsih", 978); // greek upsilon with hook symbol, U+03D2 NEW
_entityName.Add(978, "upsih");
_entityValue.Add("piv", 982); // greek pi symbol, U+03D6 ISOgrk3
_entityName.Add(982, "piv");
_entityValue.Add("bull", 8226); // bullet = black small circle, U+2022 ISOpub
_entityName.Add(8226, "bull");
_entityValue.Add("hellip", 8230); // horizontal ellipsis = three dot leader, U+2026 ISOpub
_entityName.Add(8230, "hellip");
_entityValue.Add("prime", 8242); // prime = minutes = feet, U+2032 ISOtech
_entityName.Add(8242, "prime");
_entityValue.Add("Prime", 8243); // double prime = seconds = inches, U+2033 ISOtech
_entityName.Add(8243, "Prime");
_entityValue.Add("oline", 8254); // overline = spacing overscore, U+203E NEW
_entityName.Add(8254, "oline");
_entityValue.Add("frasl", 8260); // fraction slash, U+2044 NEW
_entityName.Add(8260, "frasl");
_entityValue.Add("weierp", 8472); // script capital P = power set = Weierstrass p, U+2118 ISOamso
_entityName.Add(8472, "weierp");
_entityValue.Add("image", 8465); // blackletter capital I = imaginary part, U+2111 ISOamso
_entityName.Add(8465, "image");
_entityValue.Add("real", 8476); // blackletter capital R = real part symbol, U+211C ISOamso
_entityName.Add(8476, "real");
_entityValue.Add("trade", 8482); // trade mark sign, U+2122 ISOnum
_entityName.Add(8482, "trade");
_entityValue.Add("alefsym", 8501); // alef symbol = first transfinite cardinal, U+2135 NEW
_entityName.Add(8501, "alefsym");
_entityValue.Add("larr", 8592); // leftwards arrow, U+2190 ISOnum
_entityName.Add(8592, "larr");
_entityValue.Add("uarr", 8593); // upwards arrow, U+2191 ISOnum
_entityName.Add(8593, "uarr");
_entityValue.Add("rarr", 8594); // rightwards arrow, U+2192 ISOnum
_entityName.Add(8594, "rarr");
_entityValue.Add("darr", 8595); // downwards arrow, U+2193 ISOnum
_entityName.Add(8595, "darr");
_entityValue.Add("harr", 8596); // left right arrow, U+2194 ISOamsa
_entityName.Add(8596, "harr");
_entityValue.Add("crarr", 8629); // downwards arrow with corner leftwards = carriage return, U+21B5 NEW
_entityName.Add(8629, "crarr");
_entityValue.Add("lArr", 8656); // leftwards double arrow, U+21D0 ISOtech
_entityName.Add(8656, "lArr");
_entityValue.Add("uArr", 8657); // upwards double arrow, U+21D1 ISOamsa
_entityName.Add(8657, "uArr");
_entityValue.Add("rArr", 8658); // rightwards double arrow, U+21D2 ISOtech
_entityName.Add(8658, "rArr");
_entityValue.Add("dArr", 8659); // downwards double arrow, U+21D3 ISOamsa
_entityName.Add(8659, "dArr");
_entityValue.Add("hArr", 8660); // left right double arrow, U+21D4 ISOamsa
_entityName.Add(8660, "hArr");
_entityValue.Add("forall", 8704); // for all, U+2200 ISOtech
_entityName.Add(8704, "forall");
_entityValue.Add("part", 8706); // partial differential, U+2202 ISOtech
_entityName.Add(8706, "part");
_entityValue.Add("exist", 8707); // there exists, U+2203 ISOtech
_entityName.Add(8707, "exist");
_entityValue.Add("empty", 8709); // empty set = null set = diameter, U+2205 ISOamso
_entityName.Add(8709, "empty");
_entityValue.Add("nabla", 8711); // nabla = backward difference, U+2207 ISOtech
_entityName.Add(8711, "nabla");
_entityValue.Add("isin", 8712); // element of, U+2208 ISOtech
_entityName.Add(8712, "isin");
_entityValue.Add("notin", 8713); // not an element of, U+2209 ISOtech
_entityName.Add(8713, "notin");
_entityValue.Add("ni", 8715); // contains as member, U+220B ISOtech
_entityName.Add(8715, "ni");
_entityValue.Add("prod", 8719); // n-ary product = product sign, U+220F ISOamsb
_entityName.Add(8719, "prod");
_entityValue.Add("sum", 8721); // n-ary sumation, U+2211 ISOamsb
_entityName.Add(8721, "sum");
_entityValue.Add("minus", 8722); // minus sign, U+2212 ISOtech
_entityName.Add(8722, "minus");
_entityValue.Add("lowast", 8727); // asterisk operator, U+2217 ISOtech
_entityName.Add(8727, "lowast");
_entityValue.Add("radic", 8730); // square root = radical sign, U+221A ISOtech
_entityName.Add(8730, "radic");
_entityValue.Add("prop", 8733); // proportional to, U+221D ISOtech
_entityName.Add(8733, "prop");
_entityValue.Add("infin", 8734); // infinity, U+221E ISOtech
_entityName.Add(8734, "infin");
_entityValue.Add("ang", 8736); // angle, U+2220 ISOamso
_entityName.Add(8736, "ang");
_entityValue.Add("and", 8743); // logical and = wedge, U+2227 ISOtech
_entityName.Add(8743, "and");
_entityValue.Add("or", 8744); // logical or = vee, U+2228 ISOtech
_entityName.Add(8744, "or");
_entityValue.Add("cap", 8745); // intersection = cap, U+2229 ISOtech
_entityName.Add(8745, "cap");
_entityValue.Add("cup", 8746); // union = cup, U+222A ISOtech
_entityName.Add(8746, "cup");
_entityValue.Add("int", 8747); // integral, U+222B ISOtech
_entityName.Add(8747, "int");
_entityValue.Add("there4", 8756); // therefore, U+2234 ISOtech
_entityName.Add(8756, "there4");
_entityValue.Add("sim", 8764); // tilde operator = varies with = similar to, U+223C ISOtech
_entityName.Add(8764, "sim");
_entityValue.Add("cong", 8773); // approximately equal to, U+2245 ISOtech
_entityName.Add(8773, "cong");
_entityValue.Add("asymp", 8776); // almost equal to = asymptotic to, U+2248 ISOamsr
_entityName.Add(8776, "asymp");
_entityValue.Add("ne", 8800); // not equal to, U+2260 ISOtech
_entityName.Add(8800, "ne");
_entityValue.Add("equiv", 8801); // identical to, U+2261 ISOtech
_entityName.Add(8801, "equiv");
_entityValue.Add("le", 8804); // less-than or equal to, U+2264 ISOtech
_entityName.Add(8804, "le");
_entityValue.Add("ge", 8805); // greater-than or equal to, U+2265 ISOtech
_entityName.Add(8805, "ge");
_entityValue.Add("sub", 8834); // subset of, U+2282 ISOtech
_entityName.Add(8834, "sub");
_entityValue.Add("sup", 8835); // superset of, U+2283 ISOtech
_entityName.Add(8835, "sup");
_entityValue.Add("nsub", 8836); // not a subset of, U+2284 ISOamsn
_entityName.Add(8836, "nsub");
_entityValue.Add("sube", 8838); // subset of or equal to, U+2286 ISOtech
_entityName.Add(8838, "sube");
_entityValue.Add("supe", 8839); // superset of or equal to, U+2287 ISOtech
_entityName.Add(8839, "supe");
_entityValue.Add("oplus", 8853); // circled plus = direct sum, U+2295 ISOamsb
_entityName.Add(8853, "oplus");
_entityValue.Add("otimes", 8855); // circled times = vector product, U+2297 ISOamsb
_entityName.Add(8855, "otimes");
_entityValue.Add("perp", 8869); // up tack = orthogonal to = perpendicular, U+22A5 ISOtech
_entityName.Add(8869, "perp");
_entityValue.Add("sdot", 8901); // dot operator, U+22C5 ISOamsb
_entityName.Add(8901, "sdot");
_entityValue.Add("lceil", 8968); // left ceiling = apl upstile, U+2308 ISOamsc
_entityName.Add(8968, "lceil");
_entityValue.Add("rceil", 8969); // right ceiling, U+2309 ISOamsc
_entityName.Add(8969, "rceil");
_entityValue.Add("lfloor", 8970); // left floor = apl downstile, U+230A ISOamsc
_entityName.Add(8970, "lfloor");
_entityValue.Add("rfloor", 8971); // right floor, U+230B ISOamsc
_entityName.Add(8971, "rfloor");
_entityValue.Add("lang", 9001); // left-pointing angle bracket = bra, U+2329 ISOtech
_entityName.Add(9001, "lang");
_entityValue.Add("rang", 9002); // right-pointing angle bracket = ket, U+232A ISOtech
_entityName.Add(9002, "rang");
_entityValue.Add("loz", 9674); // lozenge, U+25CA ISOpub
_entityName.Add(9674, "loz");
_entityValue.Add("spades", 9824); // black spade suit, U+2660 ISOpub
_entityName.Add(9824, "spades");
_entityValue.Add("clubs", 9827); // black club suit = shamrock, U+2663 ISOpub
_entityName.Add(9827, "clubs");
_entityValue.Add("hearts", 9829); // black heart suit = valentine, U+2665 ISOpub
_entityName.Add(9829, "hearts");
_entityValue.Add("diams", 9830); // black diamond suit, U+2666 ISOpub
_entityName.Add(9830, "diams");
_entityValue.Add("quot", 34); // quotation mark = APL quote, U+0022 ISOnum
_entityName.Add(34, "quot");
_entityValue.Add("amp", 38); // ampersand, U+0026 ISOnum
_entityName.Add(38, "amp");
_entityValue.Add("lt", 60); // less-than sign, U+003C ISOnum
_entityName.Add(60, "lt");
_entityValue.Add("gt", 62); // greater-than sign, U+003E ISOnum
_entityName.Add(62, "gt");
_entityValue.Add("OElig", 338); // latin capital ligature OE, U+0152 ISOlat2
_entityName.Add(338, "OElig");
_entityValue.Add("oelig", 339); // latin small ligature oe, U+0153 ISOlat2
_entityName.Add(339, "oelig");
_entityValue.Add("Scaron", 352); // latin capital letter S with caron, U+0160 ISOlat2
_entityName.Add(352, "Scaron");
_entityValue.Add("scaron", 353); // latin small letter s with caron, U+0161 ISOlat2
_entityName.Add(353, "scaron");
_entityValue.Add("Yuml", 376); // latin capital letter Y with diaeresis, U+0178 ISOlat2
_entityName.Add(376, "Yuml");
_entityValue.Add("circ", 710); // modifier letter circumflex accent, U+02C6 ISOpub
_entityName.Add(710, "circ");
_entityValue.Add("tilde", 732); // small tilde, U+02DC ISOdia
_entityName.Add(732, "tilde");
_entityValue.Add("ensp", 8194); // en space, U+2002 ISOpub
_entityName.Add(8194, "ensp");
_entityValue.Add("emsp", 8195); // em space, U+2003 ISOpub
_entityName.Add(8195, "emsp");
_entityValue.Add("thinsp", 8201); // thin space, U+2009 ISOpub
_entityName.Add(8201, "thinsp");
_entityValue.Add("zwnj", 8204); // zero width non-joiner, U+200C NEW RFC 2070
_entityName.Add(8204, "zwnj");
_entityValue.Add("zwj", 8205); // zero width joiner, U+200D NEW RFC 2070
_entityName.Add(8205, "zwj");
_entityValue.Add("lrm", 8206); // left-to-right mark, U+200E NEW RFC 2070
_entityName.Add(8206, "lrm");
_entityValue.Add("rlm", 8207); // right-to-left mark, U+200F NEW RFC 2070
_entityName.Add(8207, "rlm");
_entityValue.Add("ndash", 8211); // en dash, U+2013 ISOpub
_entityName.Add(8211, "ndash");
_entityValue.Add("mdash", 8212); // em dash, U+2014 ISOpub
_entityName.Add(8212, "mdash");
_entityValue.Add("lsquo", 8216); // left single quotation mark, U+2018 ISOnum
_entityName.Add(8216, "lsquo");
_entityValue.Add("rsquo", 8217); // right single quotation mark, U+2019 ISOnum
_entityName.Add(8217, "rsquo");
_entityValue.Add("sbquo", 8218); // single low-9 quotation mark, U+201A NEW
_entityName.Add(8218, "sbquo");
_entityValue.Add("ldquo", 8220); // left double quotation mark, U+201C ISOnum
_entityName.Add(8220, "ldquo");
_entityValue.Add("rdquo", 8221); // right double quotation mark, U+201D ISOnum
_entityName.Add(8221, "rdquo");
_entityValue.Add("bdquo", 8222); // double low-9 quotation mark, U+201E NEW
_entityName.Add(8222, "bdquo");
_entityValue.Add("dagger", 8224); // dagger, U+2020 ISOpub
_entityName.Add(8224, "dagger");
_entityValue.Add("Dagger", 8225); // double dagger, U+2021 ISOpub
_entityName.Add(8225, "Dagger");
_entityValue.Add("permil", 8240); // per mille sign, U+2030 ISOtech
_entityName.Add(8240, "permil");
_entityValue.Add("lsaquo", 8249); // single left-pointing angle quotation mark, U+2039 ISO proposed
_entityName.Add(8249, "lsaquo");
_entityValue.Add("rsaquo", 8250); // single right-pointing angle quotation mark, U+203A ISO proposed
_entityName.Add(8250, "rsaquo");
_entityValue.Add("euro", 8364); // euro sign, U+20AC NEW
_entityName.Add(8364, "euro");
_maxEntitySize = 8 + 1; // we add the # char
#endregion
}
private HtmlEntity()
{
}
#endregion
#region Public Methods
/// <summary>
/// Replace known entities by characters.
/// </summary>
/// <param name="text">The source text.</param>
/// <returns>The result text.</returns>
public static string DeEntitize(string text)
{
if (text == null)
return null;
if (text.Length == 0)
return text;
StringBuilder sb = new StringBuilder(text.Length);
ParseState state = ParseState.Text;
StringBuilder entity = new StringBuilder(10);
for (int i = 0; i < text.Length; i++)
{
switch (state)
{
case ParseState.Text:
switch (text[i])
{
case '&':
state = ParseState.EntityStart;
break;
default:
sb.Append(text[i]);
break;
}
break;
case ParseState.EntityStart:
switch (text[i])
{
case ';':
if (entity.Length == 0)
{
sb.Append("&;");
}
else
{
if (entity[0] == '#')
{
string e = entity.ToString();
try
{
int code = Convert.ToInt32(e.Substring(1, e.Length - 1));
sb.Append(Convert.ToChar(code));
}
catch
{
sb.Append("&#" + e + ";");
}
}
else
{
// named entity?
int code;
object o = _entityValue[entity.ToString()];
if (o == null)
{
// nope
sb.Append("&" + entity + ";");
}
else
{
// we found one
code = (int) o;
sb.Append(Convert.ToChar(code));
}
}
entity.Remove(0, entity.Length);
}
state = ParseState.Text;
break;
case '&':
// new entity start without end, it was not an entity...
sb.Append("&" + entity);
entity.Remove(0, entity.Length);
break;
default:
entity.Append(text[i]);
if (entity.Length > _maxEntitySize)
{
// unknown stuff, just don't touch it
state = ParseState.Text;
sb.Append("&" + entity);
entity.Remove(0, entity.Length);
}
break;
}
break;
}
}
// finish the work
if (state == ParseState.EntityStart)
{
sb.Append("&" + entity);
}
return sb.ToString();
}
/// <summary>
/// Clone and entitize an HtmlNode. This will affect attribute values and nodes' text. It will also entitize all child nodes.
/// </summary>
/// <param name="node">The node to entitize.</param>
/// <returns>An entitized cloned node.</returns>
public static HtmlNode Entitize(HtmlNode node)
{
if (node == null)
{
throw new ArgumentNullException("node");
}
HtmlNode result = node.CloneNode(true);
if (result.HasAttributes)
Entitize(result.Attributes);
if (result.HasChildNodes)
{
Entitize(result.ChildNodes);
}
else
{
if (result.NodeType == HtmlNodeType.Text)
{
((HtmlTextNode) result).Text = Entitize(((HtmlTextNode) result).Text, true, true);
}
}
return result;
}
/// <summary>
/// Replace characters above 127 by entities.
/// </summary>
/// <param name="text">The source text.</param>
/// <returns>The result text.</returns>
public static string Entitize(string text)
{
return Entitize(text, true);
}
/// <summary>
/// Replace characters above 127 by entities.
/// </summary>
/// <param name="text">The source text.</param>
/// <param name="useNames">If set to false, the function will not use known entities name. Default is true.</param>
/// <returns>The result text.</returns>
public static string Entitize(string text, bool useNames)
{
return Entitize(text, useNames, false);
}
/// <summary>
/// Replace characters above 127 by entities.
/// </summary>
/// <param name="text">The source text.</param>
/// <param name="useNames">If set to false, the function will not use known entities name. Default is true.</param>
/// <param name="entitizeQuotAmpAndLtGt">If set to true, the [quote], [ampersand], [lower than] and [greather than] characters will be entitized.</param>
/// <returns>The result text</returns>
public static string Entitize(string text, bool useNames, bool entitizeQuotAmpAndLtGt)
// _entityValue.Add("quot", 34); // quotation mark = APL quote, U+0022 ISOnum
// _entityName.Add(34, "quot");
// _entityValue.Add("amp", 38); // ampersand, U+0026 ISOnum
// _entityName.Add(38, "amp");
// _entityValue.Add("lt", 60); // less-than sign, U+003C ISOnum
// _entityName.Add(60, "lt");
// _entityValue.Add("gt", 62); // greater-than sign, U+003E ISOnum
// _entityName.Add(62, "gt");
{
if (text == null)
return null;
if (text.Length == 0)
return text;
StringBuilder sb = new StringBuilder(text.Length);
for (int i = 0; i < text.Length; i++)
{
int code = text[i];
if ((code > 127) ||
(entitizeQuotAmpAndLtGt && ((code == 34) || (code == 38) || (code == 60) || (code == 62))))
{
string entity = _entityName[code] as string;
if ((entity == null) || (!useNames))
{
sb.Append("&#" + code + ";");
}
else
{
sb.Append("&" + entity + ";");
}
}
else
{
sb.Append(text[i]);
}
}
return sb.ToString();
}
#endregion
#region Private Methods
private static void Entitize(HtmlAttributeCollection collection)
{
foreach (HtmlAttribute at in collection)
{
at.Value = Entitize(at.Value);
}
}
private static void Entitize(HtmlNodeCollection collection)
{
foreach (HtmlNode node in collection)
{
if (node.HasAttributes)
Entitize(node.Attributes);
if (node.HasChildNodes)
{
Entitize(node.ChildNodes);
}
else
{
if (node.NodeType == HtmlNodeType.Text)
{
((HtmlTextNode) node).Text = Entitize(((HtmlTextNode) node).Text, true, true);
}
}
}
}
#endregion
#region Nested type: ParseState
private enum ParseState
{
Text,
EntityStart
}
#endregion
}
}
+52
View File
@@ -0,0 +1,52 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System.Xml;
namespace HtmlAgilityPack
{
internal class HtmlNameTable : XmlNameTable
{
#region Fields
private NameTable _nametable = new NameTable();
#endregion
#region Public Methods
public override string Add(string array)
{
return _nametable.Add(array);
}
public override string Add(char[] array, int offset, int length)
{
return _nametable.Add(array, offset, length);
}
public override string Get(string array)
{
return _nametable.Get(array);
}
public override string Get(char[] array, int offset, int length)
{
return _nametable.Get(array, offset, length);
}
#endregion
#region Internal Methods
internal string GetOrAdd(string array)
{
string s = Get(array);
if (s == null)
{
return Add(array);
}
return s;
}
#endregion
}
}
File diff suppressed because it is too large. Load diff
+512
View File
@@ -0,0 +1,512 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
using System.Collections.Generic;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a combined list and collection of HTML nodes.
/// </summary>
public class HtmlNodeCollection : IList<HtmlNode>
{
#region Fields
private readonly HtmlNode _parentnode;
private readonly List<HtmlNode> _items = new List<HtmlNode>();
#endregion
#region Constructors
/// <summary>
/// Initialize the HtmlNodeCollection with the base parent node
/// </summary>
/// <param name="parentnode">The base node of the collection</param>
public HtmlNodeCollection(HtmlNode parentnode)
{
_parentnode = parentnode; // may be null
}
#endregion
#region Properties
/// <summary>
/// Gets a given node from the list.
/// </summary>
public int this[HtmlNode node]
{
get
{
int index = GetNodeIndex(node);
if (index == -1)
{
throw new ArgumentOutOfRangeException("node",
"Node \"" + node.CloneNode(false).OuterHtml +
"\" was not found in the collection");
}
return index;
}
}
/// <summary>
/// Get node with tag name
/// </summary>
/// <param name="nodeName"></param>
/// <returns></returns>
public HtmlNode this[string nodeName]
{
get
{
nodeName = nodeName.ToLower();
for (int i = 0; i < _items.Count; i++)
if (_items[i].Equals(nodeName))
return _items[i];
return null;
}
}
#endregion
#region IList<HtmlNode> Members
/// <summary>
/// Gets the number of elements actually contained in the list.
/// </summary>
public int Count
{
get { return _items.Count; }
}
/// <summary>
/// Is collection read only
/// </summary>
public bool IsReadOnly
{
get { return false; }
}
/// <summary>
/// Gets the node at the specified index.
/// </summary>
public HtmlNode this[int index]
{
get { return _items[index]; }
set { _items[index] = value; }
}
/// <summary>
/// Add node to the collection
/// </summary>
/// <param name="node"></param>
public void Add(HtmlNode node)
{
_items.Add(node);
}
/// <summary>
/// Clears out the collection of HtmlNodes. Removes each nodes reference to parentnode, nextnode and prevnode
/// </summary>
public void Clear()
{
foreach (HtmlNode node in _items)
{
node.ParentNode = null;
node.NextSibling = null;
node.PreviousSibling = null;
}
_items.Clear();
}
/// <summary>
/// Gets existence of node in collection
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool Contains(HtmlNode item)
{
return _items.Contains(item);
}
/// <summary>
/// Copy collection to array
/// </summary>
/// <param name="array"></param>
/// <param name="arrayIndex"></param>
public void CopyTo(HtmlNode[] array, int arrayIndex)
{
_items.CopyTo(array, arrayIndex);
}
/// <summary>
/// Get Enumerator
/// </summary>
/// <returns></returns>
IEnumerator<HtmlNode> IEnumerable<HtmlNode>.GetEnumerator()
{
return _items.GetEnumerator();
}
/// <summary>
/// Get Explicit Enumerator
/// </summary>
/// <returns></returns>
IEnumerator IEnumerable.GetEnumerator()
{
return _items.GetEnumerator();
}
/// <summary>
/// Get index of node
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public int IndexOf(HtmlNode item)
{
return _items.IndexOf(item);
}
/// <summary>
/// Insert node at index
/// </summary>
/// <param name="index"></param>
/// <param name="node"></param>
public void Insert(int index, HtmlNode node)
{
HtmlNode next = null;
HtmlNode prev = null;
if (index > 0)
{
prev = _items[index - 1];
}
if (index < _items.Count)
{
next = _items[index];
}
_items.Insert(index, node);
if (prev != null)
{
if (node == prev)
{
throw new InvalidProgramException("Unexpected error.");
}
prev._nextnode = node;
}
if (next != null)
{
next._prevnode = node;
}
node._prevnode = prev;
if (next == node)
{
throw new InvalidProgramException("Unexpected error.");
}
node._nextnode = next;
node._parentnode = _parentnode;
}
/// <summary>
/// Remove node
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool Remove(HtmlNode item)
{
int i = _items.IndexOf(item);
RemoveAt(i);
return true;
}
/// <summary>
/// Remove <see cref="HtmlNode"/> at index
/// </summary>
/// <param name="index"></param>
public void RemoveAt(int index)
{
HtmlNode next = null;
HtmlNode prev = null;
HtmlNode oldnode = _items[index];
if (index > 0)
{
prev = _items[index - 1];
}
if (index < (_items.Count - 1))
{
next = _items[index + 1];
}
_items.RemoveAt(index);
if (prev != null)
{
if (next == prev)
{
throw new InvalidProgramException("Unexpected error.");
}
prev._nextnode = next;
}
if (next != null)
{
next._prevnode = prev;
}
oldnode._prevnode = null;
oldnode._nextnode = null;
oldnode._parentnode = null;
}
#endregion
#region Public Methods
/// <summary>
/// Get first instance of node in supplied collection
/// </summary>
/// <param name="items"></param>
/// <param name="name"></param>
/// <returns></returns>
public static HtmlNode FindFirst(HtmlNodeCollection items, string name)
{
foreach (HtmlNode node in items)
{
if (node.Name.ToLower().Contains(name))
return node;
if (node.HasChildNodes)
{
HtmlNode returnNode = FindFirst(node.ChildNodes, name);
if (returnNode != null)
return returnNode;
}
}
return null;
}
/// <summary>
/// Add node to the end of the collection
/// </summary>
/// <param name="node"></param>
public void Append(HtmlNode node)
{
HtmlNode last = null;
if (_items.Count > 0)
{
last = _items[_items.Count - 1];
}
_items.Add(node);
node._prevnode = last;
node._nextnode = null;
node._parentnode = _parentnode;
if (last != null)
{
if (last == node)
{
throw new InvalidProgramException("Unexpected error.");
}
last._nextnode = node;
}
}
/// <summary>
/// Get first instance of node with name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public HtmlNode FindFirst(string name)
{
return FindFirst(this, name);
}
/// <summary>
/// Get index of node
/// </summary>
/// <param name="node"></param>
/// <returns></returns>
public int GetNodeIndex(HtmlNode node)
{
// TODO: should we rewrite this? what would be the key of a node?
for (int i = 0; i < _items.Count; i++)
{
if (node == (_items[i]))
{
return i;
}
}
return -1;
}
/// <summary>
/// Add node to the beginning of the collection
/// </summary>
/// <param name="node"></param>
public void Prepend(HtmlNode node)
{
HtmlNode first = null;
if (_items.Count > 0)
{
first = _items[0];
}
_items.Insert(0, node);
if (node == first)
{
throw new InvalidProgramException("Unexpected error.");
}
node._nextnode = first;
node._prevnode = null;
node._parentnode = _parentnode;
if (first != null)
{
first._prevnode = node;
}
}
/// <summary>
/// Remove node at index
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public bool Remove(int index)
{
RemoveAt(index);
return true;
}
/// <summary>
/// Replace node at index
/// </summary>
/// <param name="index"></param>
/// <param name="node"></param>
public void Replace(int index, HtmlNode node)
{
HtmlNode next = null;
HtmlNode prev = null;
HtmlNode oldnode = _items[index];
if (index > 0)
{
prev = _items[index - 1];
}
if (index < (_items.Count - 1))
{
next = _items[index + 1];
}
_items[index] = node;
if (prev != null)
{
if (node == prev)
{
throw new InvalidProgramException("Unexpected error.");
}
prev._nextnode = node;
}
if (next != null)
{
next._prevnode = node;
}
node._prevnode = prev;
if (next == node)
{
throw new InvalidProgramException("Unexpected error.");
}
node._nextnode = next;
node._parentnode = _parentnode;
oldnode._prevnode = null;
oldnode._nextnode = null;
oldnode._parentnode = null;
}
#endregion
#region LINQ Methods
/// <summary>
/// Get all node descended from this collection
/// </summary>
/// <returns></returns>
public IEnumerable<HtmlNode> DescendantNodes()
{
foreach (HtmlNode item in _items)
foreach (HtmlNode n in item.DescendantNodes())
yield return n;
}
/// <summary>
/// Get all node descended from this collection
/// </summary>
/// <returns></returns>
public IEnumerable<HtmlNode> Descendants()
{
foreach (HtmlNode item in _items)
foreach (HtmlNode n in item.Descendants())
yield return n;
}
/// <summary>
/// Get all node descended from this collection with matching name
/// </summary>
/// <returns></returns>
public IEnumerable<HtmlNode> Descendants(string name)
{
foreach (HtmlNode item in _items)
foreach (HtmlNode n in item.Descendants(name))
yield return n;
}
/// <summary>
/// Gets all first generation elements in collection
/// </summary>
/// <returns></returns>
public IEnumerable<HtmlNode> Elements()
{
foreach (HtmlNode item in _items)
foreach (HtmlNode n in item.ChildNodes)
yield return n;
}
/// <summary>
/// Gets all first generation elements matching name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public IEnumerable<HtmlNode> Elements(string name)
{
foreach (HtmlNode item in _items)
foreach (HtmlNode n in item.Elements(name))
yield return n;
}
/// <summary>
/// All first generation nodes in collection
/// </summary>
/// <returns></returns>
public IEnumerable<HtmlNode> Nodes()
{
foreach (HtmlNode item in _items)
foreach (HtmlNode n in item.ChildNodes)
yield return n;
}
#endregion
}
}
+768
View File
@@ -0,0 +1,768 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Diagnostics;
using System.IO;
using System.Text;
using System.Xml;
using System.Xml.XPath;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an HTML navigator on an HTML document seen as a data store.
/// </summary>
public class HtmlNodeNavigator : XPathNavigator
{
#region Fields
private int _attindex;
private HtmlNode _currentnode;
private HtmlDocument _doc = new HtmlDocument();
private HtmlNameTable _nametable = new HtmlNameTable();
internal bool Trace;
#endregion
#region Constructors
internal HtmlNodeNavigator()
{
Reset();
}
internal HtmlNodeNavigator(HtmlDocument doc, HtmlNode currentNode)
{
if (currentNode == null)
{
throw new ArgumentNullException("currentNode");
}
if (currentNode.OwnerDocument != doc)
{
throw new ArgumentException(HtmlDocument.HtmlExceptionRefNotChild);
}
InternalTrace(null);
_doc = doc;
Reset();
_currentnode = currentNode;
}
private HtmlNodeNavigator(HtmlNodeNavigator nav)
{
if (nav == null)
{
throw new ArgumentNullException("nav");
}
InternalTrace(null);
_doc = nav._doc;
_currentnode = nav._currentnode;
_attindex = nav._attindex;
_nametable = nav._nametable; // REVIEW: should we do this?
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
public HtmlNodeNavigator(Stream stream)
{
_doc.Load(stream);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
public HtmlNodeNavigator(Stream stream, bool detectEncodingFromByteOrderMarks)
{
_doc.Load(stream, detectEncodingFromByteOrderMarks);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="encoding">The character encoding to use.</param>
public HtmlNodeNavigator(Stream stream, Encoding encoding)
{
_doc.Load(stream, encoding);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
public HtmlNodeNavigator(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
{
_doc.Load(stream, encoding, detectEncodingFromByteOrderMarks);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
/// <param name="buffersize">The minimum buffer size.</param>
public HtmlNodeNavigator(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
{
_doc.Load(stream, encoding, detectEncodingFromByteOrderMarks, buffersize);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a TextReader.
/// </summary>
/// <param name="reader">The TextReader used to feed the HTML data into the document.</param>
public HtmlNodeNavigator(TextReader reader)
{
_doc.Load(reader);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
public HtmlNodeNavigator(string path)
{
_doc.Load(path);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
public HtmlNodeNavigator(string path, bool detectEncodingFromByteOrderMarks)
{
_doc.Load(path, detectEncodingFromByteOrderMarks);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="encoding">The character encoding to use.</param>
public HtmlNodeNavigator(string path, Encoding encoding)
{
_doc.Load(path, encoding);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
public HtmlNodeNavigator(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
{
_doc.Load(path, encoding, detectEncodingFromByteOrderMarks);
Reset();
}
/// <summary>
/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
/// <param name="buffersize">The minimum buffer size.</param>
public HtmlNodeNavigator(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
{
_doc.Load(path, encoding, detectEncodingFromByteOrderMarks, buffersize);
Reset();
}
#endregion
#region Properties
/// <summary>
/// Gets the base URI for the current node.
/// Always returns string.Empty in the case of HtmlNavigator implementation.
/// </summary>
public override string BaseURI
{
get
{
InternalTrace(">");
return _nametable.GetOrAdd(string.Empty);
}
}
/// <summary>
/// Gets the current HTML document.
/// </summary>
public HtmlDocument CurrentDocument
{
get { return _doc; }
}
/// <summary>
/// Gets the current HTML node.
/// </summary>
public HtmlNode CurrentNode
{
get { return _currentnode; }
}
/// <summary>
/// Gets a value indicating whether the current node has child nodes.
/// </summary>
public override bool HasAttributes
{
get
{
InternalTrace(">" + (_currentnode.Attributes.Count > 0));
return (_currentnode.Attributes.Count > 0);
}
}
/// <summary>
/// Gets a value indicating whether the current node has child nodes.
/// </summary>
public override bool HasChildren
{
get
{
InternalTrace(">" + (_currentnode.ChildNodes.Count > 0));
return (_currentnode.ChildNodes.Count > 0);
}
}
/// <summary>
/// Gets a value indicating whether the current node is an empty element.
/// </summary>
public override bool IsEmptyElement
{
get
{
InternalTrace(">" + !HasChildren);
// REVIEW: is this ok?
return !HasChildren;
}
}
/// <summary>
/// Gets the name of the current HTML node without the namespace prefix.
/// </summary>
public override string LocalName
{
get
{
if (_attindex != -1)
{
InternalTrace("att>" + _currentnode.Attributes[_attindex].Name);
return _nametable.GetOrAdd(_currentnode.Attributes[_attindex].Name);
}
InternalTrace("node>" + _currentnode.Name);
return _nametable.GetOrAdd(_currentnode.Name);
}
}
/// <summary>
/// Gets the qualified name of the current node.
/// </summary>
public override string Name
{
get
{
InternalTrace(">" + _currentnode.Name);
return _nametable.GetOrAdd(_currentnode.Name);
}
}
/// <summary>
/// Gets the namespace URI (as defined in the W3C Namespace Specification) of the current node.
/// Always returns string.Empty in the case of HtmlNavigator implementation.
/// </summary>
public override string NamespaceURI
{
get
{
InternalTrace(">");
return _nametable.GetOrAdd(string.Empty);
}
}
/// <summary>
/// Gets the <see cref="XmlNameTable"/> associated with this implementation.
/// </summary>
public override XmlNameTable NameTable
{
get
{
InternalTrace(null);
return _nametable;
}
}
/// <summary>
/// Gets the type of the current node.
/// </summary>
public override XPathNodeType NodeType
{
get
{
switch (_currentnode.NodeType)
{
case HtmlNodeType.Comment:
InternalTrace(">" + XPathNodeType.Comment);
return XPathNodeType.Comment;
case HtmlNodeType.Document:
InternalTrace(">" + XPathNodeType.Root);
return XPathNodeType.Root;
case HtmlNodeType.Text:
InternalTrace(">" + XPathNodeType.Text);
return XPathNodeType.Text;
case HtmlNodeType.Element:
{
if (_attindex != -1)
{
InternalTrace(">" + XPathNodeType.Attribute);
return XPathNodeType.Attribute;
}
InternalTrace(">" + XPathNodeType.Element);
return XPathNodeType.Element;
}
default:
throw new NotImplementedException("Internal error: Unhandled HtmlNodeType: " +
_currentnode.NodeType);
}
}
}
/// <summary>
/// Gets the prefix associated with the current node.
/// Always returns string.Empty in the case of HtmlNavigator implementation.
/// </summary>
public override string Prefix
{
get
{
InternalTrace(null);
return _nametable.GetOrAdd(string.Empty);
}
}
/// <summary>
/// Gets the text value of the current node.
/// </summary>
public override string Value
{
get
{
InternalTrace("nt=" + _currentnode.NodeType);
switch (_currentnode.NodeType)
{
case HtmlNodeType.Comment:
InternalTrace(">" + ((HtmlCommentNode) _currentnode).Comment);
return ((HtmlCommentNode) _currentnode).Comment;
case HtmlNodeType.Document:
InternalTrace(">");
return "";
case HtmlNodeType.Text:
InternalTrace(">" + ((HtmlTextNode) _currentnode).Text);
return ((HtmlTextNode) _currentnode).Text;
case HtmlNodeType.Element:
{
if (_attindex != -1)
{
InternalTrace(">" + _currentnode.Attributes[_attindex].Value);
return _currentnode.Attributes[_attindex].Value;
}
return _currentnode.InnerText;
}
default:
throw new NotImplementedException("Internal error: Unhandled HtmlNodeType: " +
_currentnode.NodeType);
}
}
}
/// <summary>
/// Gets the xml:lang scope for the current node.
/// Always returns string.Empty in the case of HtmlNavigator implementation.
/// </summary>
public override string XmlLang
{
get
{
InternalTrace(null);
return _nametable.GetOrAdd(string.Empty);
}
}
#endregion
#region Public Methods
/// <summary>
/// Creates a new HtmlNavigator positioned at the same node as this HtmlNavigator.
/// </summary>
/// <returns>A new HtmlNavigator object positioned at the same node as the original HtmlNavigator.</returns>
public override XPathNavigator Clone()
{
InternalTrace(null);
return new HtmlNodeNavigator(this);
}
/// <summary>
/// Gets the value of the HTML attribute with the specified LocalName and NamespaceURI.
/// </summary>
/// <param name="localName">The local name of the HTML attribute.</param>
/// <param name="namespaceURI">The namespace URI of the attribute. Unsupported with the HtmlNavigator implementation.</param>
/// <returns>The value of the specified HTML attribute. String.Empty or null if a matching attribute is not found or if the navigator is not positioned on an element node.</returns>
public override string GetAttribute(string localName, string namespaceURI)
{
InternalTrace("localName=" + localName + ", namespaceURI=" + namespaceURI);
HtmlAttribute att = _currentnode.Attributes[localName];
if (att == null)
{
InternalTrace(">null");
return null;
}
InternalTrace(">" + att.Value);
return att.Value;
}
/// <summary>
/// Returns the value of the namespace node corresponding to the specified local name.
/// Always returns string.Empty for the HtmlNavigator implementation.
/// </summary>
/// <param name="name">The local name of the namespace node.</param>
/// <returns>Always returns string.Empty for the HtmlNavigator implementation.</returns>
public override string GetNamespace(string name)
{
InternalTrace("name=" + name);
return string.Empty;
}
/// <summary>
/// Determines whether the current HtmlNavigator is at the same position as the specified HtmlNavigator.
/// </summary>
/// <param name="other">The HtmlNavigator that you want to compare against.</param>
/// <returns>true if the two navigators have the same position, otherwise, false.</returns>
public override bool IsSamePosition(XPathNavigator other)
{
HtmlNodeNavigator nav = other as HtmlNodeNavigator;
if (nav == null)
{
InternalTrace(">false");
return false;
}
InternalTrace(">" + (nav._currentnode == _currentnode));
return (nav._currentnode == _currentnode);
}
/// <summary>
/// Moves to the same position as the specified HtmlNavigator.
/// </summary>
/// <param name="other">The HtmlNavigator positioned on the node that you want to move to.</param>
/// <returns>true if successful, otherwise false. If false, the position of the navigator is unchanged.</returns>
public override bool MoveTo(XPathNavigator other)
{
HtmlNodeNavigator nav = other as HtmlNodeNavigator;
if (nav == null)
{
InternalTrace(">false (nav is not an HtmlNodeNavigator)");
return false;
}
InternalTrace("moveto oid=" + nav.GetHashCode()
+ ", n:" + nav._currentnode.Name
+ ", a:" + nav._attindex);
if (nav._doc == _doc)
{
_currentnode = nav._currentnode;
_attindex = nav._attindex;
InternalTrace(">true");
return true;
}
// we don't know how to handle that
InternalTrace(">false (???)");
return false;
}
/// <summary>
/// Moves to the HTML attribute with matching LocalName and NamespaceURI.
/// </summary>
/// <param name="localName">The local name of the HTML attribute.</param>
/// <param name="namespaceURI">The namespace URI of the attribute. Unsupported with the HtmlNavigator implementation.</param>
/// <returns>true if the HTML attribute is found, otherwise, false. If false, the position of the navigator does not change.</returns>
public override bool MoveToAttribute(string localName, string namespaceURI)
{
InternalTrace("localName=" + localName + ", namespaceURI=" + namespaceURI);
int index = _currentnode.Attributes.GetAttributeIndex(localName);
if (index == -1)
{
InternalTrace(">false");
return false;
}
_attindex = index;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves to the first sibling of the current node.
/// </summary>
/// <returns>true if the navigator is successful moving to the first sibling node, false if there is no first sibling or if the navigator is currently positioned on an attribute node.</returns>
public override bool MoveToFirst()
{
if (_currentnode.ParentNode == null)
{
InternalTrace(">false");
return false;
}
if (_currentnode.ParentNode.FirstChild == null)
{
InternalTrace(">false");
return false;
}
_currentnode = _currentnode.ParentNode.FirstChild;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves to the first HTML attribute.
/// </summary>
/// <returns>true if the navigator is successful moving to the first HTML attribute, otherwise, false.</returns>
public override bool MoveToFirstAttribute()
{
if (!HasAttributes)
{
InternalTrace(">false");
return false;
}
_attindex = 0;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves to the first child of the current node.
/// </summary>
/// <returns>true if there is a first child node, otherwise false.</returns>
public override bool MoveToFirstChild()
{
if (!_currentnode.HasChildNodes)
{
InternalTrace(">false");
return false;
}
_currentnode = _currentnode.ChildNodes[0];
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves the XPathNavigator to the first namespace node of the current element.
/// Always returns false for the HtmlNavigator implementation.
/// </summary>
/// <param name="scope">An XPathNamespaceScope value describing the namespace scope.</param>
/// <returns>Always returns false for the HtmlNavigator implementation.</returns>
public override bool MoveToFirstNamespace(XPathNamespaceScope scope)
{
InternalTrace(null);
return false;
}
/// <summary>
/// Moves to the node that has an attribute of type ID whose value matches the specified string.
/// </summary>
/// <param name="id">A string representing the ID value of the node to which you want to move. This argument does not need to be atomized.</param>
/// <returns>true if the move was successful, otherwise false. If false, the position of the navigator is unchanged.</returns>
public override bool MoveToId(string id)
{
InternalTrace("id=" + id);
HtmlNode node = _doc.GetElementbyId(id);
if (node == null)
{
InternalTrace(">false");
return false;
}
_currentnode = node;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves the XPathNavigator to the namespace node with the specified local name.
/// Always returns false for the HtmlNavigator implementation.
/// </summary>
/// <param name="name">The local name of the namespace node.</param>
/// <returns>Always returns false for the HtmlNavigator implementation.</returns>
public override bool MoveToNamespace(string name)
{
InternalTrace("name=" + name);
return false;
}
/// <summary>
/// Moves to the next sibling of the current node.
/// </summary>
/// <returns>true if the navigator is successful moving to the next sibling node, false if there are no more siblings or if the navigator is currently positioned on an attribute node. If false, the position of the navigator is unchanged.</returns>
public override bool MoveToNext()
{
if (_currentnode.NextSibling == null)
{
InternalTrace(">false");
return false;
}
InternalTrace("_c=" + _currentnode.CloneNode(false).OuterHtml);
InternalTrace("_n=" + _currentnode.NextSibling.CloneNode(false).OuterHtml);
_currentnode = _currentnode.NextSibling;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves to the next HTML attribute.
/// </summary>
/// <returns></returns>
public override bool MoveToNextAttribute()
{
InternalTrace(null);
if (_attindex >= (_currentnode.Attributes.Count - 1))
{
InternalTrace(">false");
return false;
}
_attindex++;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves the XPathNavigator to the next namespace node.
/// Always returns falsefor the HtmlNavigator implementation.
/// </summary>
/// <param name="scope">An XPathNamespaceScope value describing the namespace scope.</param>
/// <returns>Always returns false for the HtmlNavigator implementation.</returns>
public override bool MoveToNextNamespace(XPathNamespaceScope scope)
{
InternalTrace(null);
return false;
}
/// <summary>
/// Moves to the parent of the current node.
/// </summary>
/// <returns>true if there is a parent node, otherwise false.</returns>
public override bool MoveToParent()
{
if (_currentnode.ParentNode == null)
{
InternalTrace(">false");
return false;
}
_currentnode = _currentnode.ParentNode;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves to the previous sibling of the current node.
/// </summary>
/// <returns>true if the navigator is successful moving to the previous sibling node, false if there is no previous sibling or if the navigator is currently positioned on an attribute node.</returns>
public override bool MoveToPrevious()
{
if (_currentnode.PreviousSibling == null)
{
InternalTrace(">false");
return false;
}
_currentnode = _currentnode.PreviousSibling;
InternalTrace(">true");
return true;
}
/// <summary>
/// Moves to the root node to which the current node belongs.
/// </summary>
public override void MoveToRoot()
{
_currentnode = _doc.DocumentNode;
InternalTrace(null);
}
#endregion
#region Internal Methods
[Conditional("TRACE")]
internal void InternalTrace(object traceValue)
{
if (!Trace)
{
return;
}
StackFrame sf = new StackFrame(1, true);
string name = sf.GetMethod().Name;
string nodename = _currentnode == null ? "(null)" : _currentnode.Name;
string nodevalue;
if (_currentnode == null)
{
nodevalue = "(null)";
}
else
{
switch (_currentnode.NodeType)
{
case HtmlNodeType.Comment:
nodevalue = ((HtmlCommentNode) _currentnode).Comment;
break;
case HtmlNodeType.Document:
nodevalue = "";
break;
case HtmlNodeType.Text:
nodevalue = ((HtmlTextNode) _currentnode).Text;
break;
default:
nodevalue = _currentnode.CloneNode(false).OuterHtml;
break;
}
}
System.Diagnostics.Trace.WriteLine(string.Format("oid={0},n={1},a={2},v={3},{4}", GetHashCode(), nodename, _attindex, nodevalue, traceValue), "N!" + name);
}
#endregion
#region Private Methods
private void Reset()
{
InternalTrace(null);
_currentnode = _doc.DocumentNode;
_attindex = -1;
}
#endregion
}
}
+29
View File
@@ -0,0 +1,29 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents the type of a node.
/// </summary>
public enum HtmlNodeType
{
/// <summary>
/// The root of a document.
/// </summary>
Document,
/// <summary>
/// An HTML element.
/// </summary>
Element,
/// <summary>
/// An HTML comment.
/// </summary>
Comment,
/// <summary>
/// A text node is always the child of an element or a document node.
/// </summary>
Text,
}
}
+92
View File
@@ -0,0 +1,92 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a parsing error found during document parsing.
/// </summary>
public class HtmlParseError
{
#region Fields
private HtmlParseErrorCode _code;
private int _line;
private int _linePosition;
private string _reason;
private string _sourceText;
private int _streamPosition;
#endregion
#region Constructors
internal HtmlParseError(
HtmlParseErrorCode code,
int line,
int linePosition,
int streamPosition,
string sourceText,
string reason)
{
_code = code;
_line = line;
_linePosition = linePosition;
_streamPosition = streamPosition;
_sourceText = sourceText;
_reason = reason;
}
#endregion
#region Properties
/// <summary>
/// Gets the type of error.
/// </summary>
public HtmlParseErrorCode Code
{
get { return _code; }
}
/// <summary>
/// Gets the line number of this error in the document.
/// </summary>
public int Line
{
get { return _line; }
}
/// <summary>
/// Gets the column number of this error in the document.
/// </summary>
public int LinePosition
{
get { return _linePosition; }
}
/// <summary>
/// Gets a description for the error.
/// </summary>
public string Reason
{
get { return _reason; }
}
/// <summary>
/// Gets the the full text of the line containing the error.
/// </summary>
public string SourceText
{
get { return _sourceText; }
}
/// <summary>
/// Gets the absolute stream position of this error in the document, relative to the start of the document.
/// </summary>
public int StreamPosition
{
get { return _streamPosition; }
}
#endregion
}
}
@@ -0,0 +1,34 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents the type of parsing error.
/// </summary>
public enum HtmlParseErrorCode
{
/// <summary>
/// A tag was not closed.
/// </summary>
TagNotClosed,
/// <summary>
/// A tag was not opened.
/// </summary>
TagNotOpened,
/// <summary>
/// There is a charset mismatch between stream and declared (META) encoding.
/// </summary>
CharsetMismatch,
/// <summary>
/// An end tag was not required.
/// </summary>
EndTagNotRequired,
/// <summary>
/// An end tag is invalid at this position.
/// </summary>
EndTagInvalidHere
}
}
+69
View File
@@ -0,0 +1,69 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an HTML text node.
/// </summary>
public class HtmlTextNode : HtmlNode
{
#region Fields
private string _text;
#endregion
#region Constructors
internal HtmlTextNode(HtmlDocument ownerdocument, int index)
:
base(HtmlNodeType.Text, ownerdocument, index)
{
}
#endregion
#region Properties
/// <summary>
/// Gets or Sets the HTML between the start and end tags of the object. In the case of a text node, it is equals to OuterHtml.
/// </summary>
public override string InnerHtml
{
get { return OuterHtml; }
set { _text = value; }
}
/// <summary>
/// Gets or Sets the object and its content in HTML.
/// </summary>
public override string OuterHtml
{
get
{
if (_text == null)
{
return base.OuterHtml;
}
return _text;
}
}
/// <summary>
/// Gets or Sets the text of the node.
/// </summary>
public string Text
{
get
{
if (_text == null)
{
return base.OuterHtml;
}
return _text;
}
set { _text = value; }
}
#endregion
}
}
+907
View File
@@ -0,0 +1,907 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.IO;
using System.Net;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
using System.Xml.Xsl;
using Microsoft.Win32;
namespace HtmlAgilityPack
{
/// <summary>
/// A utility class to get HTML document from HTTP.
/// </summary>
public class HtmlWeb
{
#region Delegates
/// <summary>
/// Represents the method that will handle the PostResponse event.
/// </summary>
public delegate void PostResponseHandler(HttpWebRequest request, HttpWebResponse response);
/// <summary>
/// Represents the method that will handle the PreHandleDocument event.
/// </summary>
public delegate void PreHandleDocumentHandler(HtmlDocument document);
/// <summary>
/// Represents the method that will handle the PreRequest event.
/// </summary>
public delegate bool PreRequestHandler(HttpWebRequest request);
#endregion
#region Fields
private bool _autoDetectEncoding = true;
private bool _cacheOnly;
private string _cachePath;
private bool _fromCache;
private int _requestDuration;
private Uri _responseUri;
private HttpStatusCode _statusCode = HttpStatusCode.OK;
private int _streamBufferSize = 1024;
private bool _useCookies;
private bool _usingCache;
/// <summary>
/// Occurs after an HTTP request has been executed.
/// </summary>
public PostResponseHandler PostResponse;
/// <summary>
/// Occurs before an HTML document is handled.
/// </summary>
public PreHandleDocumentHandler PreHandleDocument;
/// <summary>
/// Occurs before an HTTP request is executed.
/// </summary>
public PreRequestHandler PreRequest;
#endregion
#region Properties
/// <summary>
/// Gets or Sets a value indicating if document encoding must be automatically detected.
/// </summary>
public bool AutoDetectEncoding
{
get { return _autoDetectEncoding; }
set { _autoDetectEncoding = value; }
}
/// <summary>
/// Gets or Sets a value indicating whether to get document only from the cache.
/// If this is set to true and document is not found in the cache, nothing will be loaded.
/// </summary>
public bool CacheOnly
{
get { return _cacheOnly; }
set
{
if ((value) && !UsingCache)
{
throw new HtmlWebException("Cache is not enabled. Set UsingCache to true first.");
}
_cacheOnly = value;
}
}
/// <summary>
/// Gets or Sets the cache path. If null, no caching mechanism will be used.
/// </summary>
public string CachePath
{
get { return _cachePath; }
set { _cachePath = value; }
}
/// <summary>
/// Gets a value indicating if the last document was retrieved from the cache.
/// </summary>
public bool FromCache
{
get { return _fromCache; }
}
/// <summary>
/// Gets the last request duration in milliseconds.
/// </summary>
public int RequestDuration
{
get { return _requestDuration; }
}
/// <summary>
/// Gets the URI of the Internet resource that actually responded to the request.
/// </summary>
public Uri ResponseUri
{
get { return _responseUri; }
}
/// <summary>
/// Gets the last request status.
/// </summary>
public HttpStatusCode StatusCode
{
get { return _statusCode; }
}
/// <summary>
/// Gets or Sets the size of the buffer used for memory operations.
/// </summary>
public int StreamBufferSize
{
get { return _streamBufferSize; }
set
{
if (_streamBufferSize <= 0)
{
throw new ArgumentException("Size must be greater than zero.");
}
_streamBufferSize = value;
}
}
/// <summary>
/// Gets or Sets a value indicating if cookies will be stored.
/// </summary>
public bool UseCookies
{
get { return _useCookies; }
set { _useCookies = value; }
}
/// <summary>
/// Gets or Sets a value indicating whether the caching mechanisms should be used or not.
/// </summary>
public bool UsingCache
{
get
{
if (_cachePath == null)
{
return false;
}
return _usingCache;
}
set
{
if ((value) && (_cachePath == null))
{
throw new HtmlWebException("You need to define a CachePath first.");
}
_usingCache = value;
}
}
#endregion
#region Public Methods
/// <summary>
/// Gets the MIME content type for a given path extension.
/// </summary>
/// <param name="extension">The input path extension.</param>
/// <param name="def">The default content type to return if any error occurs.</param>
/// <returns>The path extension's MIME content type.</returns>
public static string GetContentTypeForExtension(string extension, string def)
{
if (string.IsNullOrEmpty(extension))
{
return def;
}
string contentType = "";
try
{
RegistryKey reg = Registry.ClassesRoot;
reg = reg.OpenSubKey(extension, false);
if (reg != null) contentType = (string)reg.GetValue("", def);
}
catch (Exception)
{
contentType = def;
}
return contentType;
}
/// <summary>
/// Gets the path extension for a given MIME content type.
/// </summary>
/// <param name="contentType">The input MIME content type.</param>
/// <param name="def">The default path extension to return if any error occurs.</param>
/// <returns>The MIME content type's path extension.</returns>
public static string GetExtensionForContentType(string contentType, string def)
{
if (string.IsNullOrEmpty(contentType))
{
return def;
}
string ext = "";
try
{
RegistryKey reg = Registry.ClassesRoot;
reg = reg.OpenSubKey(@"MIME\Database\Content Type\" + contentType, false);
if (reg != null) ext = (string)reg.GetValue("Extension", def);
}
catch (Exception)
{
ext = def;
}
return ext;
}
/// <summary>
/// Creates an instance of the given type from the specified Internet resource.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="type">The requested type.</param>
/// <returns>An newly created instance.</returns>
public object CreateInstance(string url, Type type)
{
return CreateInstance(url, null, null, type);
}
/// <summary>
/// Creates an instance of the given type from the specified Internet resource.
/// </summary>
/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
/// <param name="xsltArgs">An <see cref="XsltArgumentList"/> containing the namespace-qualified arguments used as input to the transform.</param>
/// <param name="type">The requested type.</param>
/// <returns>An newly created instance.</returns>
public object CreateInstance(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, Type type)
{
return CreateInstance(htmlUrl, xsltUrl, xsltArgs, type, null);
}
/// <summary>
/// Creates an instance of the given type from the specified Internet resource.
/// </summary>
/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
/// <param name="xsltArgs">An <see cref="XsltArgumentList"/> containing the namespace-qualified arguments used as input to the transform.</param>
/// <param name="type">The requested type.</param>
/// <param name="xmlPath">A file path where the temporary XML before transformation will be saved. Mostly used for debugging purposes.</param>
/// <returns>An newly created instance.</returns>
public object CreateInstance(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, Type type,
string xmlPath)
{
StringWriter sw = new StringWriter();
XmlTextWriter writer = new XmlTextWriter(sw);
if (xsltUrl == null)
{
LoadHtmlAsXml(htmlUrl, writer);
}
else
{
if (xmlPath == null)
{
LoadHtmlAsXml(htmlUrl, xsltUrl, xsltArgs, writer);
}
else
{
LoadHtmlAsXml(htmlUrl, xsltUrl, xsltArgs, writer, xmlPath);
}
}
writer.Flush();
StringReader sr = new StringReader(sw.ToString());
XmlTextReader reader = new XmlTextReader(sr);
XmlSerializer serializer = new XmlSerializer(type);
object o;
try
{
o = serializer.Deserialize(reader);
}
catch (InvalidOperationException ex)
{
throw new Exception(ex + ", --- xml:" + sw);
}
return o;
}
/// <summary>
/// Gets an HTML document from an Internet resource and saves it to the specified file.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="path">The location of the file where you want to save the document.</param>
public void Get(string url, string path)
{
Get(url, path, "GET");
}
/// <summary>
/// Gets an HTML document from an Internet resource and saves it to the specified file. - Proxy aware
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="path">The location of the file where you want to save the document.</param>
/// <param name="proxy"></param>
/// <param name="credentials"></param>
public void Get(string url, string path, WebProxy proxy, NetworkCredential credentials)
{
Get(url, path, proxy, credentials, "GET");
}
/// <summary>
/// Gets an HTML document from an Internet resource and saves it to the specified file.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="path">The location of the file where you want to save the document.</param>
/// <param name="method">The HTTP method used to open the connection, such as GET, POST, PUT, or PROPFIND.</param>
public void Get(string url, string path, string method)
{
Uri uri = new Uri(url);
if ((uri.Scheme == Uri.UriSchemeHttps) ||
(uri.Scheme == Uri.UriSchemeHttp))
{
Get(uri, method, path, null, null, null);
}
else
{
throw new HtmlWebException("Unsupported uri scheme: '" + uri.Scheme + "'.");
}
}
/// <summary>
/// Gets an HTML document from an Internet resource and saves it to the specified file. Understands Proxies
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="path">The location of the file where you want to save the document.</param>
/// <param name="credentials"></param>
/// <param name="method">The HTTP method used to open the connection, such as GET, POST, PUT, or PROPFIND.</param>
/// <param name="proxy"></param>
public void Get(string url, string path, WebProxy proxy, NetworkCredential credentials, string method)
{
Uri uri = new Uri(url);
if ((uri.Scheme == Uri.UriSchemeHttps) ||
(uri.Scheme == Uri.UriSchemeHttp))
{
Get(uri, method, path, null, proxy, credentials);
}
else
{
throw new HtmlWebException("Unsupported uri scheme: '" + uri.Scheme + "'.");
}
}
/// <summary>
/// Gets the cache file path for a specified url.
/// </summary>
/// <param name="uri">The url fo which to retrieve the cache path. May not be null.</param>
/// <returns>The cache file path.</returns>
public string GetCachePath(Uri uri)
{
if (uri == null)
{
throw new ArgumentNullException("uri");
}
if (!UsingCache)
{
throw new HtmlWebException("Cache is not enabled. Set UsingCache to true first.");
}
string cachePath;
if (uri.AbsolutePath == "/")
{
cachePath = Path.Combine(_cachePath, ".htm");
}
else
{
cachePath = Path.Combine(_cachePath, (uri.Host + uri.AbsolutePath).Replace('/', '\\'));
}
return cachePath;
}
/// <summary>
/// Gets an HTML document from an Internet resource.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <returns>A new HTML document.</returns>
public HtmlDocument Load(string url)
{
return Load(url, "GET");
}
/// <summary>
/// Gets an HTML document from an Internet resource.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="proxyHost">Host to use for Proxy</param>
/// <param name="proxyPort">Port the Proxy is on</param>
/// <param name="userId">User Id for Authentication</param>
/// <param name="password">Password for Authentication</param>
/// <returns>A new HTML document.</returns>
public HtmlDocument Load(string url, string proxyHost, int proxyPort, string userId, string password)
{
//Create my proxy
WebProxy myProxy = new WebProxy(proxyHost, proxyPort);
myProxy.BypassProxyOnLocal = true;
//Create my credentials
NetworkCredential myCreds = null;
if ((userId != null) && (password != null))
{
myCreds = new NetworkCredential(userId, password);
CredentialCache credCache = new CredentialCache();
//Add the creds
credCache.Add(myProxy.Address, "Basic", myCreds);
credCache.Add(myProxy.Address, "Digest", myCreds);
}
return Load(url, "GET", myProxy, myCreds);
}
/// <summary>
/// Loads an HTML document from an Internet resource.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="method">The HTTP method used to open the connection, such as GET, POST, PUT, or PROPFIND.</param>
/// <returns>A new HTML document.</returns>
public HtmlDocument Load(string url, string method)
{
Uri uri = new Uri(url);
HtmlDocument doc;
if ((uri.Scheme == Uri.UriSchemeHttps) ||
(uri.Scheme == Uri.UriSchemeHttp))
{
doc = LoadUrl(uri, method, null, null);
}
else
{
if (uri.Scheme == Uri.UriSchemeFile)
{
doc = new HtmlDocument();
doc.OptionAutoCloseOnEnd = false;
doc.OptionAutoCloseOnEnd = true;
doc.DetectEncodingAndLoad(url, _autoDetectEncoding);
}
else
{
throw new HtmlWebException("Unsupported uri scheme: '" + uri.Scheme + "'.");
}
}
if (PreHandleDocument != null)
{
PreHandleDocument(doc);
}
return doc;
}
/// <summary>
/// Loads an HTML document from an Internet resource.
/// </summary>
/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="method">The HTTP method used to open the connection, such as GET, POST, PUT, or PROPFIND.</param>
/// <param name="proxy">Proxy to use with this request</param>
/// <param name="credentials">Credentials to use when authenticating</param>
/// <returns>A new HTML document.</returns>
public HtmlDocument Load(string url, string method, WebProxy proxy, NetworkCredential credentials)
{
Uri uri = new Uri(url);
HtmlDocument doc;
if ((uri.Scheme == Uri.UriSchemeHttps) ||
(uri.Scheme == Uri.UriSchemeHttp))
{
doc = LoadUrl(uri, method, proxy, credentials);
}
else
{
if (uri.Scheme == Uri.UriSchemeFile)
{
doc = new HtmlDocument();
doc.OptionAutoCloseOnEnd = false;
doc.OptionAutoCloseOnEnd = true;
doc.DetectEncodingAndLoad(url, _autoDetectEncoding);
}
else
{
throw new HtmlWebException("Unsupported uri scheme: '" + uri.Scheme + "'.");
}
}
if (PreHandleDocument != null)
{
PreHandleDocument(doc);
}
return doc;
}
/// <summary>
/// Loads an HTML document from an Internet resource and saves it to the specified XmlTextWriter.
/// </summary>
/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="writer">The XmlTextWriter to which you want to save.</param>
public void LoadHtmlAsXml(string htmlUrl, XmlTextWriter writer)
{
HtmlDocument doc = Load(htmlUrl);
doc.Save(writer);
}
/// <summary>
/// Loads an HTML document from an Internet resource and saves it to the specified XmlTextWriter, after an XSLT transformation.
/// </summary>
/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
/// <param name="xsltArgs">An XsltArgumentList containing the namespace-qualified arguments used as input to the transform.</param>
/// <param name="writer">The XmlTextWriter to which you want to save.</param>
public void LoadHtmlAsXml(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, XmlTextWriter writer)
{
LoadHtmlAsXml(htmlUrl, xsltUrl, xsltArgs, writer, null);
}
/// <summary>
/// Loads an HTML document from an Internet resource and saves it to the specified XmlTextWriter, after an XSLT transformation.
/// </summary>
/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp". May not be null.</param>
/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
/// <param name="xsltArgs">An XsltArgumentList containing the namespace-qualified arguments used as input to the transform.</param>
/// <param name="writer">The XmlTextWriter to which you want to save.</param>
/// <param name="xmlPath">A file path where the temporary XML before transformation will be saved. Mostly used for debugging purposes.</param>
public void LoadHtmlAsXml(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, XmlTextWriter writer,
string xmlPath)
{
if (htmlUrl == null)
{
throw new ArgumentNullException("htmlUrl");
}
HtmlDocument doc = Load(htmlUrl);
if (xmlPath != null)
{
XmlTextWriter w = new XmlTextWriter(xmlPath, doc.Encoding);
doc.Save(w);
w.Close();
}
if (xsltArgs == null)
{
xsltArgs = new XsltArgumentList();
}
// add some useful variables to the xslt doc
xsltArgs.AddParam("url", "", htmlUrl);
xsltArgs.AddParam("requestDuration", "", RequestDuration);
xsltArgs.AddParam("fromCache", "", FromCache);
XslCompiledTransform xslt = new XslCompiledTransform();
xslt.Load(xsltUrl);
xslt.Transform(doc, xsltArgs, writer);
}
#endregion
#region Private Methods
private static void FilePreparePath(string target)
{
if (File.Exists(target))
{
FileAttributes atts = File.GetAttributes(target);
File.SetAttributes(target, atts & ~FileAttributes.ReadOnly);
}
else
{
string dir = Path.GetDirectoryName(target);
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}
}
}
private static DateTime RemoveMilliseconds(DateTime t)
{
return new DateTime(t.Year, t.Month, t.Day, t.Hour, t.Minute, t.Second, 0);
}
// ReSharper disable UnusedMethodReturnValue.Local
private static long SaveStream(Stream stream, string path, DateTime touchDate, int streamBufferSize)
// ReSharper restore UnusedMethodReturnValue.Local
{
FilePreparePath(path);
FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write);
BinaryReader br = null;
BinaryWriter bw = null;
long len = 0;
try
{
br = new BinaryReader(stream);
bw = new BinaryWriter(fs);
byte[] buffer;
do
{
buffer = br.ReadBytes(streamBufferSize);
len += buffer.Length;
if (buffer.Length > 0)
{
bw.Write(buffer);
}
} while (buffer.Length > 0);
}
finally
{
if (br != null)
{
br.Close();
}
if (bw != null)
{
bw.Flush();
bw.Close();
}
if (fs != null)
{
fs.Close();
}
}
File.SetLastWriteTime(path, touchDate);
return len;
}
private HttpStatusCode Get(Uri uri, string method, string path, HtmlDocument doc, IWebProxy proxy,
ICredentials creds)
{
string cachePath = null;
HttpWebRequest req;
bool oldFile = false;
req = WebRequest.Create(uri) as HttpWebRequest;
req.Method = method;
if (proxy != null)
{
if (creds != null)
{
proxy.Credentials = creds;
req.Credentials = creds;
}
else
{
proxy.Credentials = CredentialCache.DefaultCredentials;
req.Credentials = CredentialCache.DefaultCredentials;
}
req.Proxy = proxy;
}
_fromCache = false;
_requestDuration = 0;
int tc = Environment.TickCount;
if (UsingCache)
{
cachePath = GetCachePath(req.RequestUri);
if (File.Exists(cachePath))
{
req.IfModifiedSince = File.GetLastAccessTime(cachePath);
oldFile = true;
}
}
if (_cacheOnly)
{
if (!File.Exists(cachePath))
{
throw new HtmlWebException("File was not found at cache path: '" + cachePath + "'");
}
if (path != null)
{
IOLibrary.CopyAlways(cachePath, path);
// touch the file
File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
}
_fromCache = true;
return HttpStatusCode.NotModified;
}
if (_useCookies)
{
req.CookieContainer = new CookieContainer();
}
if (PreRequest != null)
{
// allow our user to change the request at will
if (!PreRequest(req))
{
return HttpStatusCode.ResetContent;
}
// dump cookie
// if (_useCookies)
// {
// foreach(Cookie cookie in req.CookieContainer.GetCookies(req.RequestUri))
// {
// HtmlLibrary.Trace("Cookie " + cookie.Name + "=" + cookie.Value + " path=" + cookie.Path + " domain=" + cookie.Domain);
// }
// }
}
HttpWebResponse resp;
try
{
resp = req.GetResponse() as HttpWebResponse;
}
catch (WebException we)
{
_requestDuration = Environment.TickCount - tc;
resp = (HttpWebResponse)we.Response;
if (resp == null)
{
if (oldFile)
{
if (path != null)
{
IOLibrary.CopyAlways(cachePath, path);
// touch the file
File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
}
return HttpStatusCode.NotModified;
}
throw;
}
}
catch (Exception)
{
_requestDuration = Environment.TickCount - tc;
throw;
}
// allow our user to get some info from the response
if (PostResponse != null)
{
PostResponse(req, resp);
}
_requestDuration = Environment.TickCount - tc;
_responseUri = resp.ResponseUri;
bool html = IsHtmlContent(resp.ContentType);
Encoding respenc;
if ((resp.ContentEncoding != null) && (resp.ContentEncoding.Length > 0))
{
respenc = Encoding.GetEncoding(resp.ContentEncoding);
}
else
{
respenc = null;
}
if (resp.StatusCode == HttpStatusCode.NotModified)
{
if (UsingCache)
{
_fromCache = true;
if (path != null)
{
IOLibrary.CopyAlways(cachePath, path);
// touch the file
File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
}
return resp.StatusCode;
}
else
{
// this should *never* happen...
throw new HtmlWebException("Server has send a NotModifed code, without cache enabled.");
}
}
Stream s = resp.GetResponseStream();
if (s != null)
{
if (UsingCache)
{
// NOTE: LastModified does not contain milliseconds, so we remove them to the file
SaveStream(s, cachePath, RemoveMilliseconds(resp.LastModified), _streamBufferSize);
// save headers
SaveCacheHeaders(req.RequestUri, resp);
if (path != null)
{
// copy and touch the file
IOLibrary.CopyAlways(cachePath, path);
File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
}
}
else
{
// try to work in-memory
if ((doc != null) && (html))
{
if (respenc != null)
{
doc.Load(s, respenc);
}
else
{
doc.Load(s, true);
}
}
}
resp.Close();
}
return resp.StatusCode;
}
private string GetCacheHeader(Uri requestUri, string name, string def)
{
// note: some headers are collection (ex: www-authenticate)
// we don't handle that here
XmlDocument doc = new XmlDocument();
doc.Load(GetCacheHeadersPath(requestUri));
XmlNode node =
doc.SelectSingleNode("//h[translate(@n, 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')='" +
name.ToUpper() + "']");
if (node == null)
{
return def;
}
// attribute should exist
return node.Attributes[name].Value;
}
private string GetCacheHeadersPath(Uri uri)
{
//return Path.Combine(GetCachePath(uri), ".h.xml");
return GetCachePath(uri) + ".h.xml";
}
private bool IsCacheHtmlContent(string path)
{
string ct = GetContentTypeForExtension(Path.GetExtension(path), null);
return IsHtmlContent(ct);
}
private bool IsHtmlContent(string contentType)
{
return contentType.ToLower().StartsWith("text/html");
}
private HtmlDocument LoadUrl(Uri uri, string method, WebProxy proxy, NetworkCredential creds)
{
HtmlDocument doc = new HtmlDocument();
doc.OptionAutoCloseOnEnd = false;
doc.OptionFixNestedTags = true;
_statusCode = Get(uri, method, null, doc, proxy, creds);
if (_statusCode == HttpStatusCode.NotModified)
{
// read cached encoding
doc.DetectEncodingAndLoad(GetCachePath(uri));
}
return doc;
}
private void SaveCacheHeaders(Uri requestUri, HttpWebResponse resp)
{
// we cache the original headers aside the cached document.
string file = GetCacheHeadersPath(requestUri);
XmlDocument doc = new XmlDocument();
doc.LoadXml("<c></c>");
XmlNode cache = doc.FirstChild;
foreach (string header in resp.Headers)
{
XmlNode entry = doc.CreateElement("h");
XmlAttribute att = doc.CreateAttribute("n");
att.Value = header;
entry.Attributes.Append(att);
att = doc.CreateAttribute("v");
att.Value = resp.Headers[header];
entry.Attributes.Append(att);
cache.AppendChild(entry);
}
doc.Save(file);
}
#endregion
}
}
+24
View File
@@ -0,0 +1,24 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an exception thrown by the HtmlWeb utility class.
/// </summary>
public class HtmlWebException : Exception
{
#region Constructors
/// <summary>
/// Creates an instance of the HtmlWebException.
/// </summary>
/// <param name="message">The exception's message.</param>
public HtmlWebException(string message)
: base(message)
{
}
#endregion
}
}
+28
View File
@@ -0,0 +1,28 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System.IO;
namespace HtmlAgilityPack
{
internal struct IOLibrary
{
#region Internal Methods
internal static void CopyAlways(string source, string target)
{
if (!File.Exists(source))
return;
Directory.CreateDirectory(Path.GetDirectoryName(target));
MakeWritable(target);
File.Copy(source, target, true);
}
internal static void MakeWritable(string path)
{
if (!File.Exists(path))
return;
File.SetAttributes(path, File.GetAttributes(path) & ~FileAttributes.ReadOnly);
}
#endregion
}
}
+27
View File
@@ -0,0 +1,27 @@
Microsoft Permissive License (Ms-PL)
This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
1. Definitions
The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the same meaning here as under U.S. copyright law.
A “contribution” is the original software, or any additions or changes to the software.
A “contributor” is any person that distributes its contribution under this license.
“Licensed patents” are a contributor’s patent claims that read directly on its contribution.
2. Grant of Rights
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
3. Conditions and Limitations
(A) No Trademark License- This license does not grant you rights to use any contributors’ name, logo, or trademarks.
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
(E) The software is licensed “as-is.” You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
(F) If you distribute the software or derivative works with programs you develop, you agree to indemnify, defend, and hold harmless all contributors from any claims, including attorneys’ fees, related to the distribution or use of your programs. For clarity, you have no such obligations to a contributor for any claims based solely on the unmodified contributions of that contributor.
(G) If you make any additions or changes to the original software, you may only distribute them under a new namespace. In addition, you will clearly identify your changes or additions as your own.
+453
View File
@@ -0,0 +1,453 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.IO;
using System.Text;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a document with mixed code and text. ASP, ASPX, JSP, are good example of such documents.
/// </summary>
public class MixedCodeDocument
{
#region Fields
private int _c;
internal MixedCodeDocumentFragmentList _codefragments;
private MixedCodeDocumentFragment _currentfragment;
internal MixedCodeDocumentFragmentList _fragments;
private int _index;
private int _line;
private int _lineposition;
private ParseState _state;
private Encoding _streamencoding;
internal string _text;
internal MixedCodeDocumentFragmentList _textfragments;
/// <summary>
/// Gets or sets the token representing code end.
/// </summary>
public string TokenCodeEnd = "%>";
/// <summary>
/// Gets or sets the token representing code start.
/// </summary>
public string TokenCodeStart = "<%";
/// <summary>
/// Gets or sets the token representing code directive.
/// </summary>
public string TokenDirective = "@";
/// <summary>
/// Gets or sets the token representing response write directive.
/// </summary>
public string TokenResponseWrite = "Response.Write ";
private string TokenTextBlock = "TextBlock({0})";
#endregion
#region Constructors
/// <summary>
/// Creates a mixed code document instance.
/// </summary>
public MixedCodeDocument()
{
_codefragments = new MixedCodeDocumentFragmentList(this);
_textfragments = new MixedCodeDocumentFragmentList(this);
_fragments = new MixedCodeDocumentFragmentList(this);
}
#endregion
#region Properties
/// <summary>
/// Gets the code represented by the mixed code document seen as a template.
/// </summary>
public string Code
{
get
{
string s = "";
int i = 0;
foreach (MixedCodeDocumentFragment frag in _fragments)
{
switch (frag._type)
{
case MixedCodeDocumentFragmentType.Text:
s += TokenResponseWrite + string.Format(TokenTextBlock, i) + "\n";
i++;
break;
case MixedCodeDocumentFragmentType.Code:
s += ((MixedCodeDocumentCodeFragment) frag).Code + "\n";
break;
}
}
return s;
}
}
/// <summary>
/// Gets the list of code fragments in the document.
/// </summary>
public MixedCodeDocumentFragmentList CodeFragments
{
get { return _codefragments; }
}
/// <summary>
/// Gets the list of all fragments in the document.
/// </summary>
public MixedCodeDocumentFragmentList Fragments
{
get { return _fragments; }
}
/// <summary>
/// Gets the encoding of the stream used to read the document.
/// </summary>
public Encoding StreamEncoding
{
get { return _streamencoding; }
}
/// <summary>
/// Gets the list of text fragments in the document.
/// </summary>
public MixedCodeDocumentFragmentList TextFragments
{
get { return _textfragments; }
}
#endregion
#region Public Methods
/// <summary>
/// Create a code fragment instances.
/// </summary>
/// <returns>The newly created code fragment instance.</returns>
public MixedCodeDocumentCodeFragment CreateCodeFragment()
{
return (MixedCodeDocumentCodeFragment) CreateFragment(MixedCodeDocumentFragmentType.Code);
}
/// <summary>
/// Create a text fragment instances.
/// </summary>
/// <returns>The newly created text fragment instance.</returns>
public MixedCodeDocumentTextFragment CreateTextFragment()
{
return (MixedCodeDocumentTextFragment) CreateFragment(MixedCodeDocumentFragmentType.Text);
}
/// <summary>
/// Loads a mixed code document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
public void Load(Stream stream)
{
Load(new StreamReader(stream));
}
/// <summary>
/// Loads a mixed code document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
public void Load(Stream stream, bool detectEncodingFromByteOrderMarks)
{
Load(new StreamReader(stream, detectEncodingFromByteOrderMarks));
}
/// <summary>
/// Loads a mixed code document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="encoding">The character encoding to use.</param>
public void Load(Stream stream, Encoding encoding)
{
Load(new StreamReader(stream, encoding));
}
/// <summary>
/// Loads a mixed code document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
public void Load(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
{
Load(new StreamReader(stream, encoding, detectEncodingFromByteOrderMarks));
}
/// <summary>
/// Loads a mixed code document from a stream.
/// </summary>
/// <param name="stream">The input stream.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
/// <param name="buffersize">The minimum buffer size.</param>
public void Load(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
{
Load(new StreamReader(stream, encoding, detectEncodingFromByteOrderMarks, buffersize));
}
/// <summary>
/// Loads a mixed code document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
public void Load(string path)
{
Load(new StreamReader(path));
}
/// <summary>
/// Loads a mixed code document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
public void Load(string path, bool detectEncodingFromByteOrderMarks)
{
Load(new StreamReader(path, detectEncodingFromByteOrderMarks));
}
/// <summary>
/// Loads a mixed code document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="encoding">The character encoding to use.</param>
public void Load(string path, Encoding encoding)
{
Load(new StreamReader(path, encoding));
}
/// <summary>
/// Loads a mixed code document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
public void Load(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
{
Load(new StreamReader(path, encoding, detectEncodingFromByteOrderMarks));
}
/// <summary>
/// Loads a mixed code document from a file.
/// </summary>
/// <param name="path">The complete file path to be read.</param>
/// <param name="encoding">The character encoding to use.</param>
/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
/// <param name="buffersize">The minimum buffer size.</param>
public void Load(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
{
Load(new StreamReader(path, encoding, detectEncodingFromByteOrderMarks, buffersize));
}
/// <summary>
/// Loads the mixed code document from the specified TextReader.
/// </summary>
/// <param name="reader">The TextReader used to feed the HTML data into the document.</param>
public void Load(TextReader reader)
{
_codefragments.Clear();
_textfragments.Clear();
// all pseudo constructors get down to this one
StreamReader sr = reader as StreamReader;
if (sr != null)
{
_streamencoding = sr.CurrentEncoding;
}
_text = reader.ReadToEnd();
reader.Close();
Parse();
}
/// <summary>
/// Loads a mixed document from a text
/// </summary>
/// <param name="html">The text to load.</param>
public void LoadHtml(string html)
{
Load(new StringReader(html));
}
/// <summary>
/// Saves the mixed document to the specified stream.
/// </summary>
/// <param name="outStream">The stream to which you want to save.</param>
public void Save(Stream outStream)
{
StreamWriter sw = new StreamWriter(outStream, GetOutEncoding());
Save(sw);
}
/// <summary>
/// Saves the mixed document to the specified stream.
/// </summary>
/// <param name="outStream">The stream to which you want to save.</param>
/// <param name="encoding">The character encoding to use.</param>
public void Save(Stream outStream, Encoding encoding)
{
StreamWriter sw = new StreamWriter(outStream, encoding);
Save(sw);
}
/// <summary>
/// Saves the mixed document to the specified file.
/// </summary>
/// <param name="filename">The location of the file where you want to save the document.</param>
public void Save(string filename)
{
StreamWriter sw = new StreamWriter(filename, false, GetOutEncoding());
Save(sw);
}
/// <summary>
/// Saves the mixed document to the specified file.
/// </summary>
/// <param name="filename">The location of the file where you want to save the document.</param>
/// <param name="encoding">The character encoding to use.</param>
public void Save(string filename, Encoding encoding)
{
StreamWriter sw = new StreamWriter(filename, false, encoding);
Save(sw);
}
/// <summary>
/// Saves the mixed document to the specified StreamWriter.
/// </summary>
/// <param name="writer">The StreamWriter to which you want to save.</param>
public void Save(StreamWriter writer)
{
Save((TextWriter) writer);
}
/// <summary>
/// Saves the mixed document to the specified TextWriter.
/// </summary>
/// <param name="writer">The TextWriter to which you want to save.</param>
public void Save(TextWriter writer)
{
writer.Flush();
}
#endregion
#region Internal Methods
internal MixedCodeDocumentFragment CreateFragment(MixedCodeDocumentFragmentType type)
{
switch (type)
{
case MixedCodeDocumentFragmentType.Text:
return new MixedCodeDocumentTextFragment(this);
case MixedCodeDocumentFragmentType.Code:
return new MixedCodeDocumentCodeFragment(this);
default:
throw new NotSupportedException();
}
}
internal Encoding GetOutEncoding()
{
if (_streamencoding != null)
return _streamencoding;
return Encoding.Default;
}
#endregion
#region Private Methods
private void IncrementPosition()
{
_index++;
if (_c == 10)
{
_lineposition = 1;
_line++;
}
else
_lineposition++;
}
private void Parse()
{
_state = ParseState.Text;
_index = 0;
_currentfragment = CreateFragment(MixedCodeDocumentFragmentType.Text);
while (_index < _text.Length)
{
_c = _text[_index];
IncrementPosition();
switch (_state)
{
case ParseState.Text:
if (_index + TokenCodeStart.Length < _text.Length)
{
if (_text.Substring(_index - 1, TokenCodeStart.Length) == TokenCodeStart)
{
_state = ParseState.Code;
_currentfragment.Length = _index - 1 - _currentfragment.Index;
_currentfragment = CreateFragment(MixedCodeDocumentFragmentType.Code);
SetPosition();
continue;
}
}
break;
case ParseState.Code:
if (_index + TokenCodeEnd.Length < _text.Length)
{
if (_text.Substring(_index - 1, TokenCodeEnd.Length) == TokenCodeEnd)
{
_state = ParseState.Text;
_currentfragment.Length = _index + TokenCodeEnd.Length - _currentfragment.Index;
_index += TokenCodeEnd.Length;
_lineposition += TokenCodeEnd.Length;
_currentfragment = CreateFragment(MixedCodeDocumentFragmentType.Text);
SetPosition();
continue;
}
}
break;
}
}
_currentfragment.Length = _index - _currentfragment.Index;
}
private void SetPosition()
{
_currentfragment.Line = _line;
_currentfragment._lineposition = _lineposition;
_currentfragment.Index = _index - 1;
_currentfragment.Length = 0;
}
#endregion
#region Nested type: ParseState
private enum ParseState
{
Text,
Code
}
#endregion
}
}
@@ -0,0 +1,51 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a fragment of code in a mixed code document.
/// </summary>
public class MixedCodeDocumentCodeFragment : MixedCodeDocumentFragment
{
#region Fields
private string _code;
#endregion
#region Constructors
internal MixedCodeDocumentCodeFragment(MixedCodeDocument doc)
:
base(doc, MixedCodeDocumentFragmentType.Code)
{
}
#endregion
#region Properties
/// <summary>
/// Gets the fragment code text.
/// </summary>
public string Code
{
get
{
if (_code == null)
{
_code = FragmentText.Substring(Doc.TokenCodeStart.Length,
FragmentText.Length - Doc.TokenCodeEnd.Length -
Doc.TokenCodeStart.Length - 1).Trim();
if (_code.StartsWith("="))
{
_code = Doc.TokenResponseWrite + _code.Substring(1, _code.Length - 1);
}
}
return _code;
}
set { _code = value; }
}
#endregion
}
}
@@ -0,0 +1,95 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a base class for fragments in a mixed code document.
/// </summary>
public abstract class MixedCodeDocumentFragment
{
#region Fields
internal MixedCodeDocument Doc;
private string _fragmentText;
internal int Index;
internal int Length;
private int _line;
internal int _lineposition;
internal MixedCodeDocumentFragmentType _type;
#endregion
#region Constructors
internal MixedCodeDocumentFragment(MixedCodeDocument doc, MixedCodeDocumentFragmentType type)
{
Doc = doc;
_type = type;
switch (type)
{
case MixedCodeDocumentFragmentType.Text:
Doc._textfragments.Append(this);
break;
case MixedCodeDocumentFragmentType.Code:
Doc._codefragments.Append(this);
break;
}
Doc._fragments.Append(this);
}
#endregion
#region Properties
/// <summary>
/// Gets the fragement text.
/// </summary>
public string FragmentText
{
get
{
if (_fragmentText == null)
{
_fragmentText = Doc._text.Substring(Index, Length);
}
return FragmentText;
}
internal set { _fragmentText = value; }
}
/// <summary>
/// Gets the type of fragment.
/// </summary>
public MixedCodeDocumentFragmentType FragmentType
{
get { return _type; }
}
/// <summary>
/// Gets the line number of the fragment.
/// </summary>
public int Line
{
get { return _line; }
internal set { _line = value; }
}
/// <summary>
/// Gets the line position (column) of the fragment.
/// </summary>
public int LinePosition
{
get { return _lineposition; }
}
/// <summary>
/// Gets the fragment position in the document's stream.
/// </summary>
public int StreamPosition
{
get { return Index; }
}
#endregion
}
}
@@ -0,0 +1,236 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a list of mixed code fragments.
/// </summary>
public class MixedCodeDocumentFragmentList : IEnumerable
{
#region Fields
private MixedCodeDocument _doc;
private ArrayList _items = new ArrayList();
#endregion
#region Constructors
internal MixedCodeDocumentFragmentList(MixedCodeDocument doc)
{
_doc = doc;
}
#endregion
#region Properties
///<summary>
/// Gets the Document
///</summary>
public MixedCodeDocument Doc
{
get { return _doc; }
}
/// <summary>
/// Gets the number of fragments contained in the list.
/// </summary>
public int Count
{
get { return _items.Count; }
}
/// <summary>
/// Gets a fragment from the list using its index.
/// </summary>
public MixedCodeDocumentFragment this[int index]
{
get { return _items[index] as MixedCodeDocumentFragment; }
}
#endregion
#region IEnumerable Members
/// <summary>
/// Gets an enumerator that can iterate through the fragment list.
/// </summary>
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
#endregion
#region Public Methods
/// <summary>
/// Appends a fragment to the list of fragments.
/// </summary>
/// <param name="newFragment">The fragment to append. May not be null.</param>
public void Append(MixedCodeDocumentFragment newFragment)
{
if (newFragment == null)
{
throw new ArgumentNullException("newFragment");
}
_items.Add(newFragment);
}
/// <summary>
/// Gets an enumerator that can iterate through the fragment list.
/// </summary>
public MixedCodeDocumentFragmentEnumerator GetEnumerator()
{
return new MixedCodeDocumentFragmentEnumerator(_items);
}
/// <summary>
/// Prepends a fragment to the list of fragments.
/// </summary>
/// <param name="newFragment">The fragment to append. May not be null.</param>
public void Prepend(MixedCodeDocumentFragment newFragment)
{
if (newFragment == null)
{
throw new ArgumentNullException("newFragment");
}
_items.Insert(0, newFragment);
}
/// <summary>
/// Remove a fragment from the list of fragments. If this fragment was not in the list, an exception will be raised.
/// </summary>
/// <param name="fragment">The fragment to remove. May not be null.</param>
public void Remove(MixedCodeDocumentFragment fragment)
{
if (fragment == null)
{
throw new ArgumentNullException("fragment");
}
int index = GetFragmentIndex(fragment);
if (index == -1)
{
throw new IndexOutOfRangeException();
}
RemoveAt(index);
}
/// <summary>
/// Remove all fragments from the list.
/// </summary>
public void RemoveAll()
{
_items.Clear();
}
/// <summary>
/// Remove a fragment from the list of fragments, using its index in the list.
/// </summary>
/// <param name="index">The index of the fragment to remove.</param>
public void RemoveAt(int index)
{
//MixedCodeDocumentFragment frag = (MixedCodeDocumentFragment) _items[index];
_items.RemoveAt(index);
}
#endregion
#region Internal Methods
internal void Clear()
{
_items.Clear();
}
internal int GetFragmentIndex(MixedCodeDocumentFragment fragment)
{
if (fragment == null)
{
throw new ArgumentNullException("fragment");
}
for (int i = 0; i < _items.Count; i++)
{
if ((_items[i]) == fragment)
{
return i;
}
}
return -1;
}
#endregion
#region Nested type: MixedCodeDocumentFragmentEnumerator
/// <summary>
/// Represents a fragment enumerator.
/// </summary>
public class MixedCodeDocumentFragmentEnumerator : IEnumerator
{
#region Fields
private int _index;
private ArrayList _items;
#endregion
#region Constructors
internal MixedCodeDocumentFragmentEnumerator(ArrayList items)
{
_items = items;
_index = -1;
}
#endregion
#region Properties
/// <summary>
/// Gets the current element in the collection.
/// </summary>
public MixedCodeDocumentFragment Current
{
get { return (MixedCodeDocumentFragment) (_items[_index]); }
}
#endregion
#region IEnumerator Members
/// <summary>
/// Gets the current element in the collection.
/// </summary>
object IEnumerator.Current
{
get { return (Current); }
}
/// <summary>
/// Advances the enumerator to the next element of the collection.
/// </summary>
/// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
public bool MoveNext()
{
_index++;
return (_index < _items.Count);
}
/// <summary>
/// Sets the enumerator to its initial position, which is before the first element in the collection.
/// </summary>
public void Reset()
{
_index = -1;
}
#endregion
}
#endregion
}
}
@@ -0,0 +1,19 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents the type of fragment in a mixed code document.
/// </summary>
public enum MixedCodeDocumentFragmentType
{
/// <summary>
/// The fragment contains code.
/// </summary>
Code,
/// <summary>
/// The fragment contains text.
/// </summary>
Text,
}
}
@@ -0,0 +1,32 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a fragment of text in a mixed code document.
/// </summary>
public class MixedCodeDocumentTextFragment : MixedCodeDocumentFragment
{
#region Constructors
internal MixedCodeDocumentTextFragment(MixedCodeDocument doc)
:
base(doc, MixedCodeDocumentFragmentType.Text)
{
}
#endregion
#region Properties
/// <summary>
/// Gets the fragment text.
/// </summary>
public string Text
{
get { return FragmentText; }
set { FragmentText = value; }
}
#endregion
}
}
+35
View File
@@ -0,0 +1,35 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
internal class NameValuePair
{
#region Fields
internal readonly string Name;
internal string Value;
#endregion
#region Constructors
internal NameValuePair()
{
}
internal NameValuePair(string name)
:
this()
{
Name = name;
}
internal NameValuePair(string name, string value)
:
this(name)
{
Value = value;
}
#endregion
}
}
+101
View File
@@ -0,0 +1,101 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
namespace HtmlAgilityPack
{
internal class NameValuePairList
{
#region Fields
internal readonly string Text;
private ArrayList _allPairs;
private Hashtable _pairsWithName;
#endregion
#region Constructors
internal NameValuePairList() :
this(null)
{
}
internal NameValuePairList(string text)
{
Text = text;
_allPairs = new ArrayList();
_pairsWithName = new Hashtable();
Parse(text);
}
#endregion
#region Internal Methods
internal static string GetNameValuePairsValue(string text, string name)
{
NameValuePairList l = new NameValuePairList(text);
return l.GetNameValuePairValue(name);
}
internal ArrayList GetNameValuePairs(string name)
{
if (name == null)
return _allPairs;
return _pairsWithName[name] as ArrayList;
}
internal string GetNameValuePairValue(string name)
{
if (name == null)
throw new ArgumentNullException();
ArrayList al = GetNameValuePairs(name);
if (al == null)
return null;
// return first item
NameValuePair nvp = al[0] as NameValuePair;
return nvp != null ? nvp.Value : string.Empty;
}
#endregion
#region Private Methods
private void Parse(string text)
{
_allPairs.Clear();
_pairsWithName.Clear();
if (text == null)
return;
string[] p = text.Split(';');
foreach (string pv in p)
{
if (pv.Length == 0)
continue;
string[] onep = pv.Split(new char[] {'='}, 2);
if (onep.Length==0)
continue;
NameValuePair nvp = new NameValuePair(onep[0].Trim().ToLower());
nvp.Value = onep.Length < 2 ? "" : onep[1];
_allPairs.Add(nvp);
// index by name
ArrayList al = _pairsWithName[nvp.Name] as ArrayList;
if (al == null)
{
al = new ArrayList();
_pairsWithName[nvp.Name] = al;
}
al.Add(nvp);
}
}
#endregion
}
}
+156
View File
@@ -0,0 +1,156 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// A utility class to compute CRC32.
/// </summary>
public class Crc32
{
#region Fields
private uint _crc32;
#endregion
#region Static Members
private static uint[] crc_32_tab = // CRC polynomial 0xedb88320
{
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
#endregion
#region Properties
internal uint CheckSum
{
get { return _crc32; }
set { _crc32 = value; }
}
#endregion
#region Public Methods
/// <summary>
/// Compute a checksum for a given array of bytes.
/// </summary>
/// <param name="bytes">The array of bytes to compute the checksum for.</param>
/// <returns>The computed checksum.</returns>
public static uint CRC32Bytes(byte[] bytes)
{
uint oldcrc32;
oldcrc32 = 0xFFFFFFFF;
int len = bytes.Length;
for (int i = 0; len > 0; i++)
{
--len;
oldcrc32 = UPDC32(bytes[len], oldcrc32);
}
return ~oldcrc32;
}
/// <summary>
/// Compute a checksum for a given string.
/// </summary>
/// <param name="text">The string to compute the checksum for.</param>
/// <returns>The computed checksum.</returns>
public static uint CRC32String(string text)
{
uint oldcrc32;
oldcrc32 = 0xFFFFFFFF;
int len = text.Length;
ushort uCharVal;
byte lowByte, hiByte;
for (int i = 0; len > 0; i++)
{
--len;
uCharVal = text[len];
unchecked
{
lowByte = (byte) (uCharVal & 0x00ff);
hiByte = (byte) (uCharVal >> 8);
}
oldcrc32 = UPDC32(hiByte, oldcrc32);
oldcrc32 = UPDC32(lowByte, oldcrc32);
}
return ~oldcrc32;
}
#endregion
#region Internal Methods
internal uint AddToCRC32(int c)
{
return AddToCRC32((ushort) c);
}
internal uint AddToCRC32(ushort c)
{
byte lowByte, hiByte;
lowByte = (byte) (c & 0x00ff);
hiByte = (byte) (c >> 8);
_crc32 = UPDC32(hiByte, _crc32);
_crc32 = UPDC32(lowByte, _crc32);
return ~_crc32;
}
#endregion
#region Private Methods
private static uint UPDC32(byte octet, uint crc)
{
return (crc_32_tab[((crc) ^ (octet)) & 0xff] ^ ((crc) >> 8));
}
#endregion
}
}
+6 -3
View File
@@ -13,7 +13,6 @@ ASSEMBLED_DOCS = \
EXTRA_DIST = \
abc-removal.txt \
AgilityPack.dll \
api-style.css \
assembly-bundle \
check-exports \
@@ -68,12 +67,14 @@ EXTRA_DIST = \
dist-hook:
$(mkdir_p) $(distdir)/sources
$(mkdir_p) $(distdir)/svgs
$(mkdir_p) $(distdir)/HtmlAgilityPack
cp sources/* $(distdir)/sources
cp svgs/* $(distdir)/svgs
cp HtmlAgilityPack/* $(distdir)/HtmlAgilityPack
clean-local:
-rm -Rf $(srcdir)/html
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe*
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* $(srcdir)/AgilityPack.dll*
-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
monoapi.zip: monoapi.tree
@@ -101,5 +102,7 @@ $(srcdir)/deploy/.stamp: convert.exe Makefile.am
extract: $(srcdir)/deploy/.stamp
convert.exe: convert.cs AgilityPack.dll
cd $(srcdir) && $(MAKE) PROFILE=net_1_1 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
AgilityPack.dll:
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) AgilityPack.dll
+2 -4
View File
@@ -64,10 +64,8 @@ PROGRAMS
* convert.cs
Converts an HTML file into a valid XML document, uses the
AgilityPack.dll. The sources to this DLL live in GNOME CVS
module beagle/Filters/AgilityPack.
A binary is shipped for our convenience.
AgilityPack.dll. The sources to this DLL live in the
HtmlAgilityPack folder, and are a prerequisite for convert.exe.
DATAFILES:
---------
+3
View File
@@ -10,6 +10,9 @@ ASSEMBLED_DOCS = \
convert.exe: convert.cs AgilityPack.dll
$(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
AgilityPack.dll:
$(CSCOMPILE) -target:library -out:$@ HtmlAgilityPack/*.cs
monoapi.zip: monoapi.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
monoapi.tree: toc.xml docs.make
+4
View File
@@ -1,3 +1,7 @@
2010-01-12 Zoltan Varga <[email protected]>
* profiles/basic.make: Document that mono 2.6 can't be compiled with mono SVN HEAD.
2009-11-17 Marek Habersack <[email protected]>
* tests.make (TEST_RUNTIME_WRAPPERS_PATH): added - used to set up
+5
View File
@@ -1,3 +1,8 @@
2010-01-07 Sebastien Pouliot <[email protected]>
* Consts.cs.in: Update FX version for SL3 latest released version
[Backport r149187]
2009-11-12 Jb Evain <[email protected]>
* Consts.cs.in: add a AssemblySystem_Core constant.
+4 -4
View File
@@ -69,11 +69,11 @@ internal
public const string FxFileVersion = "3.0.4506.648";
public const string VsFileVersion = "6.0.6001.17014";
#elif NET_2_1
// Versions of .NET Framework for SilverLight
// Versions of .NET Framework for Silverlight 3.0
public const string FxVersion = "2.0.5.0";
public const string VsVersion = "9.0.0.0"; // TODO:
public const string FxFileVersion = "2.0.40115.0";
public const string VsFileVersion = "9.0.50727.42"; // TODO:
public const string VsVersion = "9.0.0.0"; // unused, but needed for compilation
public const string FxFileVersion = "3.0.40818.0";
public const string VsFileVersion = "9.0.50727.42"; // unused, but needed for compilation
#elif NET_2_0 || BOOTSTRAP_NET_2_0
// Versions of .NET Framework 2.0 RTM
public const string FxVersion = "2.0.0.0";
+5 -2
View File
@@ -47,17 +47,20 @@ PROFILE_CS = $(depsdir)/basic-profile-check.cs
PROFILE_EXE = $(PROFILE_CS:.cs=.exe)
PROFILE_OUT = $(PROFILE_CS:.cs=.out)
MAKE_Q=$(if $(V),,-s)
do-profile-check:
@ok=:; \
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
$(MAKE) -s $(PROFILE_OUT) > /dev/null || ok=false; \
$(MAKE) $(MAKE_Q) $(PROFILE_OUT) || ok=false; \
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
if $$ok; then :; else \
if test -f $(topdir)/class/lib/monolite/mcs.exe; then \
$(MAKE) -s do-profile-check-monolite ; \
else \
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
echo "*** You need a C# compiler installed to build MCS (make sure mcs works from the command line)" 1>&2 ; \
echo "*** You need a C# 1.0 compiler installed to build MCS (make sure mcs works from the command line)" 1>&2 ; \
echo "*** mcs/gmcs from mono > 2.6 will not work, since they target NET 2.0." 1>&2 ; \
echo "*** Read INSTALL.txt for information on how to bootstrap a Mono installation." 1>&2 ; \
exit 1; fi; fi
+4
View File
@@ -1,3 +1,7 @@
2010-01-11 Sebastien Pouliot <[email protected]>
* Makefile: For 2.1 build System.Core.dll before System.Net.dll
2009-11-07 Zoltan Varga <[email protected]>
* Makefile (net_2_0_dirs): Add System.Data.Services.
+4
View File
@@ -1,3 +1,7 @@
2009-12-18 Atsushi Enomoto <[email protected]>
* I18N.CJK.Test.cs : add NET_2_0 condition. fix 1.1 test.
2009-10-09 Atsushi Enomoto <[email protected]>
* I18N.CJK.Test.cs : added test for iso-2022-jp wrong esc sequences.
+2
View File
@@ -198,6 +198,7 @@ namespace MonoTests.I18N.CJK
Assert.AreEqual ("\u001B$0", Encoding.GetEncoding (50220).GetString (new byte [] {0x1B, 0x24, 0x30}), "#1");
}
#if NET_2_0
[Test]
public void CP50220BrokenESC2 ()
{
@@ -211,6 +212,7 @@ namespace MonoTests.I18N.CJK
// neither ...
Assert.AreEqual ("\u001B$0", Encoding.GetEncoding (50220, new EncoderExceptionFallback (), new DecoderExceptionFallback ()).GetString (new byte [] {0x1B, 0x24, 0x30}), "#2");
}
#endif
[Test]
#if !NET_2_0
+1 -1
View File
@@ -133,9 +133,9 @@ net_2_1_dirs := \
corlib \
Mono.CompilerServices.SymbolWriter \
System \
System.Net \
System.XML \
System.Core \
System.Net \
System.Xml.Linq \
System.Runtime.Serialization \
System.ServiceModel \
@@ -1,3 +1,80 @@
2010-01-21 Carlos Alberto Cortez <[email protected]>
* ComboBox.cs: When the normal drop down window is closed, make sure
that the auto complete list -if any- is closed as well, instead of
stay open without need.
2010-01-21 Carlos Alberto Cortez <[email protected]>
* TextBox.cs: When showing the autocomplete listbox, make sure it's on
top, by calling the raw XplatUI.SetZOrder for it, since we can't
properly call BringToFront on it as it is parentless. This fixes an
issue when using this feature with ComboBox's own parentless listbox.
Fixes the remaining bits of #489339.
2010-01-21 Carlos Alberto Cortez <[email protected]>
* XplatUI.cs:
* XplatUIDriver:
* XplatUICarbon:
* XplatUIWin32:
* XplatUIX11.cs:
* XplatUIStructs: Implement support for different kind of audible
alerts in Windows, and update the requiered classes.
* MessageBox.cs:
* TextBoxBase.cs: Update calls to XplatUI.AudibleAlert.
Fixes #473725.
2010-01-21 Carlos Alberto Cortez <[email protected]>
* ComboBox.cs: When use manually setting DropDownHeight, ignore the
MaxDropDownHeight property - also rename our field 'count' to
'visible_items_count' to avoid confusion as much as possible.
Fixes an issue with several items, showing an incorrect layout.
2010-01-21 Carlos Alberto Cortez <[email protected]>
* RichTextBox.cs: SelectedText should set Modified to true. Observe
that this is happening just here, not for the Text property, and
neither for the TextBoxBase impl.
Fixes #569950.
2010-01-10 Carlos Alberto Cortez <[email protected]>
* ToolStripMenuItem.cs: Put the Checked/CheckState logic in a single
place and synchronize the events properly. Fixes a lack of
coordination between the events - which should be fired together.
2010-01-09 Carlos Alberto Cortez <[email protected]>
* TrackBar.cs: Move our events code to a single method, allowing it to
optionally fire the Scroll event. This way we both avoid the
duplicated calls to OnScroll and also will be able to fire Scroll
*before* OnValueChanged in other places.
Fixes #568026.
2010-01-04 Carlos Alberto Cortez <[email protected]>
* RadioButton.cs: When drawing, if Appearance is Button use the old
normal routine in the theme engine, instead of using the one in 2.0,
since this last one doesn't support proper rendering of the control as
a button.
Fixes #567904.
2010-01-03 Carlos Alberto Cortez <[email protected]>
* GroupBoxRenderer.cs: Properly use SystemColors.GrayText to draw to
text of the group box if it is disabled.
Fixes #567847.
2009-12-31 Carlos Alberto Cortez <[email protected]>
* XplatUICarbon.cs: Implement the overriden AudibleAlert
function in XplatUICarbon. Currently it throws
NotImplementedException which will kill a WinForms application showing
a dialog box.
Patch by Erik Ylvisaker ([email protected]).
2009-11-12 Carlos Alberto Cortez <[email protected]>
[merge the very last changes from trunk, -r 144884:145790]
@@ -1598,6 +1598,12 @@ namespace System.Windows.Forms
listbox_ctrl.Dispose ();
listbox_ctrl = null;
}
#if NET_2_0
// The auto complete list could have been shown after the listbox,
// so make sure it's hidden.
if (textbox_ctrl != null)
textbox_ctrl.HideAutoCompleteList ();
#endif
}
private int FindStringCaseInsensitive (string search)
@@ -2522,11 +2528,11 @@ namespace System.Windows.Forms
else { // DropDown or DropDownList
width = owner.DropDownWidth;
int count = (owner.Items.Count <= owner.MaxDropDownItems) ? owner.Items.Count : owner.MaxDropDownItems;
int visible_items_count = (owner.Items.Count <= owner.MaxDropDownItems) ? owner.Items.Count : owner.MaxDropDownItems;
if (owner.DrawMode == DrawMode.OwnerDrawVariable) {
height = 0;
for (int i = 0; i < count; i++) {
for (int i = 0; i < visible_items_count; i++) {
height += owner.GetItemHeight (i);
}
@@ -2535,14 +2541,15 @@ namespace System.Windows.Forms
} else {
#if NET_2_0
if (owner.DropDownHeight == default_drop_down_height) { // ignore DropDownHeight
height = owner.ItemHeight * count;
height = owner.ItemHeight * visible_items_count;
show_scrollbar = owner.Items.Count > owner.MaxDropDownItems;
} else {
// ignore visible items count, and use manual height instead
height = owner.DropDownHeight;
show_scrollbar = (count * owner.ItemHeight) > height;
show_scrollbar = (owner.Items.Count * owner.ItemHeight) > height;
}
#else
height = owner.ItemHeight * count;
height = owner.ItemHeight * visible_items_count;
show_scrollbar = owner.Items.Count > owner.MaxDropDownItems;
#endif
}
@@ -111,7 +111,8 @@ namespace System.Windows.Forms
if (groupBoxText != String.Empty) {
if (textColor == Color.Empty)
textColor = SystemColors.ControlText;
textColor = state == GroupBoxState.Normal ? SystemColors.ControlText :
SystemColors.GrayText;
TextRenderer.DrawText (g, groupBoxText, font, new Point (bounds.Left + 8, bounds.Top), textColor, flags);
}
}
@@ -69,6 +69,7 @@ namespace System.Windows.Forms
string help_keyword;
HelpNavigator help_navigator;
object help_param;
AlertType alert_type;
#endregion // MessageBoxFrom Local Variables
#region MessageBoxForm Constructors
@@ -81,26 +82,31 @@ namespace System.Windows.Forms
switch (icon) {
case MessageBoxIcon.None: {
icon_image = null;
alert_type = AlertType.Default;
break;
}
case MessageBoxIcon.Error: { // Same as MessageBoxIcon.Hand and MessageBoxIcon.Stop
icon_image = SystemIcons.Error;
alert_type = AlertType.Error;
break;
}
case MessageBoxIcon.Question: {
icon_image = SystemIcons.Question;
alert_type = AlertType.Question;
break;
}
case MessageBoxIcon.Asterisk: { // Same as MessageBoxIcon.Information
icon_image = SystemIcons.Information;
alert_type = AlertType.Information;
break;
}
case MessageBoxIcon.Warning: { // Same as MessageBoxIcon.Exclamation:
icon_image = SystemIcons.Warning;
alert_type = AlertType.Warning;
break;
}
}
@@ -190,7 +196,7 @@ namespace System.Windows.Forms
if (Owner != null)
TopMost = Owner.TopMost;
XplatUI.AudibleAlert ();
XplatUI.AudibleAlert (alert_type);
this.ShowDialog ();
return this.DialogResult;
@@ -182,7 +182,7 @@ namespace System.Windows.Forms {
ThemeEngine.Current.CalculateRadioButtonTextAndImageLayout (this, Point.Empty, out glyph_rectangle, out text_rectangle, out image_rectangle);
// Draw our button
if (FlatStyle != FlatStyle.System)
if (FlatStyle != FlatStyle.System && Appearance != Appearance.Button)
ThemeEngine.Current.DrawRadioButton (pe.Graphics, this, glyph_rectangle, text_rectangle, image_rectangle, pe.ClipRectangle);
else
ThemeEngine.Current.DrawRadioButton (pe.Graphics, this.ClientRectangle, this);
@@ -443,6 +443,8 @@ namespace System.Windows.Forms {
}
set {
// TextBox/TextBoxBase don't set Modified in this same property
Modified = true;
base.SelectedText = value;
}
}
@@ -996,6 +996,8 @@ namespace System.Windows.Forms {
HighlightedIndex = -1;
Show ();
// make sure we are on top - call the raw routine, since we are parentless
XplatUI.SetZOrder (Handle, IntPtr.Zero, true, false);
Invalidate ();
}
@@ -1597,7 +1597,7 @@ namespace System.Windows.Forms
OnTextChanged(EventArgs.Empty);
} else {
XplatUI.AudibleAlert();
XplatUI.AudibleAlert(AlertType.Default);
}
return;
} else if (ch == 8) {
@@ -109,11 +109,7 @@ namespace System.Windows.Forms
}
}
set {
if (this.checked_state != (value ? CheckState.Checked : CheckState.Unchecked)) {
this.checked_state = value ? CheckState.Checked : CheckState.Unchecked;
this.Invalidate ();
this.OnCheckedChanged (EventArgs.Empty);
}
CheckState = value ? CheckState.Checked : CheckState.Unchecked;
}
}
@@ -138,8 +134,12 @@ namespace System.Windows.Forms
if (!Enum.IsDefined (typeof (CheckState), value))
throw new InvalidEnumArgumentException (string.Format ("Enum argument value '{0}' is not valid for CheckState", value));
if (value == checked_state)
return;
this.checked_state = value;
this.Invalidate ();
this.OnCheckedChanged (EventArgs.Empty);
this.OnCheckStateChanged (EventArgs.Empty);
}
}
@@ -537,23 +537,33 @@ namespace System.Windows.Forms
public int Value {
get { return position; }
set {
if (value < Minimum || value > Maximum)
throw new ArgumentException(
string.Format("'{0}' is not a valid value for 'Value'. 'Value' should be between 'Minimum' and 'Maximum'", value));
if (position != value) {
position = value;
// XXX any reason we don't call OnValueChanged here?
EventHandler eh = (EventHandler)(Events [ValueChangedEvent]);
if (eh != null)
eh (this, EventArgs.Empty);
Invalidate (thumb_area);
}
SetValue (value, false);
}
}
void SetValue (int value, bool fire_onscroll)
{
if (value < Minimum || value > Maximum)
throw new ArgumentException(
String.Format ("'{0}' is not a valid value for 'Value'. 'Value' should be between 'Minimum' and 'Maximum'", value));
if (position == value)
return;
position = value;
// OnScroll goes before OnValueChanged
if (fire_onscroll)
OnScroll (EventArgs.Empty);
// XXX any reason we don't call OnValueChanged here?
EventHandler eh = (EventHandler)(Events [ValueChangedEvent]);
if (eh != null)
eh (this, EventArgs.Empty);
Invalidate (thumb_area);
}
#endregion //Public Properties
#region Public Methods
@@ -695,14 +705,14 @@ namespace System.Windows.Forms
private void UpdatePos (int newPos, bool update_trumbpos)
{
if (newPos < minimum){
Value = minimum;
SetValue (minimum, true);
}
else {
if (newPos > maximum) {
Value = maximum;
SetValue (maximum, true);
}
else {
Value = newPos;
SetValue (newPos, true);
}
}
}
@@ -712,7 +722,6 @@ namespace System.Windows.Forms
{
UpdatePos (position + LargeChange, true);
Invalidate (thumb_area);
OnScroll (new EventArgs ());
}
// Used by UIA implementation, so making internal
@@ -720,21 +729,18 @@ namespace System.Windows.Forms
{
UpdatePos (position - LargeChange, true);
Invalidate (thumb_area);
OnScroll (new EventArgs ());
}
private void SmallIncrement ()
{
UpdatePos (position + SmallChange, true);
Invalidate (thumb_area);
OnScroll (new EventArgs ());
}
private void SmallDecrement ()
{
UpdatePos (position - SmallChange, true);
Invalidate (thumb_area);
OnScroll (new EventArgs ());
}
private void OnMouseUpTB (object sender, MouseEventArgs e)
@@ -821,13 +827,9 @@ namespace System.Windows.Forms
mouse_moved = true;
/* Moving the thumb */
if (thumb_pressed) {
int old_value = Value;
Value = ThemeEngine.Current.TrackBarValueFromMousePosition (e.X, e.Y, this);
if (Value != old_value)
OnScroll (EventArgs.Empty);
}
if (thumb_pressed)
SetValue (ThemeEngine.Current.TrackBarValueFromMousePosition (e.X, e.Y, this), true);
ThumbEntered = GetRealThumbRectangle ().Contains (e.Location);
}
@@ -892,16 +894,16 @@ namespace System.Windows.Forms
case Keys.Home:
if (horiz)
Value = Minimum;
SetValue (Minimum, true);
else
Value = Maximum;
SetValue (Maximum, true);
break;
case Keys.End:
if (horiz)
Value = Maximum;
SetValue (Maximum, true);
else
Value = Minimum;
SetValue (Minimum, true);
break;
default:
@@ -464,11 +464,11 @@ namespace System.Windows.Forms {
driver.Activate(handle);
}
internal static void AudibleAlert() {
internal static void AudibleAlert(AlertType alert) {
#if DriverDebug
Console.WriteLine("AudibleAlert(): Called");
#endif
driver.AudibleAlert();
driver.AudibleAlert(alert);
}
internal static bool CalculateWindowRect(ref Rectangle ClientRect, CreateParams cp, Menu menu, out Rectangle WindowRect) {
@@ -791,8 +791,8 @@ namespace System.Windows.Forms {
ActiveWindow = handle;
}
internal override void AudibleAlert() {
throw new NotImplementedException();
internal override void AudibleAlert(AlertType alert) {
AlertSoundPlay ();
}
internal override void CaretVisible (IntPtr hwnd, bool visible) {
@@ -2369,6 +2369,9 @@ namespace System.Windows.Forms {
[DllImport("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
extern static short GetMBarHeight ();
[DllImport("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
extern static void AlertSoundPlay ();
#region Cursor imports
[DllImport("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
extern static Carbon.HIRect CGDisplayBounds (IntPtr displayID);
@@ -274,7 +274,7 @@ namespace System.Windows.Forms {
internal abstract event EventHandler Idle;
#region XplatUI Driver Methods
internal abstract void AudibleAlert();
internal abstract void AudibleAlert(AlertType alert);
internal abstract void EnableThemes();
@@ -874,5 +874,13 @@ namespace System.Windows.Forms {
SC_MONITORPOWER = 0xF170,
SC_CONTEXTHELP = 0xF180
}
internal enum AlertType {
Default = 1,
Error = 2,
Question = 3,
Warning = 4,
Information = 5
}
}
@@ -1568,8 +1568,24 @@ namespace System.Windows.Forms {
Console.WriteLine("Xplat version $revision: $");
}
internal override void AudibleAlert() {
Win32PlaySound("Default", IntPtr.Zero, SndFlags.SND_ALIAS | SndFlags.SND_ASYNC | SndFlags.SND_NOSTOP | SndFlags.SND_NOWAIT);
string GetSoundAlias (AlertType alert)
{
switch (alert) {
case AlertType.Error:
return "SystemHand";
case AlertType.Question:
return "SystemQuestion";
case AlertType.Warning:
return "SystemExclamation";
case AlertType.Information:
return "SystemAsterisk";
default:
return "SystemDefault";
}
}
internal override void AudibleAlert(AlertType alert) {
Win32PlaySound(GetSoundAlias (alert), IntPtr.Zero, SndFlags.SND_ALIAS_ID | SndFlags.SND_ASYNC | SndFlags.SND_NOSTOP | SndFlags.SND_NOWAIT);
}
internal override void GetDisplaySize(out Size size) {
@@ -2570,7 +2570,7 @@ namespace System.Windows.Forms {
}
}
internal override void AudibleAlert() {
internal override void AudibleAlert(AlertType alert) {
XBell(DisplayHandle, 0);
return;
}
@@ -3355,7 +3355,7 @@ namespace System.Windows.Forms {
case HitTest.HTBOTTOMLEFT: handle = Cursors.SizeNESW.handle; break;
case HitTest.HTBOTTOMRIGHT: handle = Cursors.SizeNWSE.handle; break;
case HitTest.HTERROR: if ((msg.LParam.ToInt32() >> 16) == (int)Msg.WM_LBUTTONDOWN) {
AudibleAlert();
AudibleAlert(AlertType.Default);
}
handle = Cursors.Default.handle;
break;
@@ -1,3 +1,16 @@
2010-01-21 Carlos Alberto Cortez <[email protected]>
* RichTextBoxTest.cs: New test for the Modified property.
2010-01-10 Carlos Alberto Cortez <[email protected]>
* ToolStripMenuItemTest: New test for the events related to the check
state.
2010-01-09 Carlos Alberto Cortez <[email protected]>
* TrackBarTest.cs: New test for events.
2009-11-12 Carlos Alberto Cortez <[email protected]>
* ComboBoxTest.cs: New test case for data binding and Text
@@ -291,6 +291,23 @@ namespace MonoTests.System.Windows.Forms
form.Close ();
}
[Test]
public void Modified ()
{
RichTextBox rtb = new RichTextBox ();
Assert.AreEqual (false, rtb.Modified, "#A1");
rtb.SelectedText = "mono";
Assert.AreEqual (true, rtb.Modified, "#B1");
rtb.Modified = false;
Assert.AreEqual (false, rtb.Modified, "#C1");
// Only SelectedText seems to cause a change in Modified, as opposed to Text
rtb.Text = "moon";
Assert.AreEqual (false, rtb.Modified, "#D1");
}
[Test]
public void ReadOnly_BackColor_Set ()
{
@@ -287,6 +287,42 @@ namespace MonoTests.System.Windows.Forms
return this.ProcessCmdKey (ref m, keys);
}
}
[Test]
public void EventsTest ()
{
ToolStripMenuItem tsmi = new ToolStripMenuItem ("Sample");
tsmi.CheckStateChanged += new EventHandler (tsmi_CheckStateChanged);
tsmi.CheckedChanged += new EventHandler (tsmi_CheckedChanged);
event_log = String.Empty;
Assert.AreEqual (false, tsmi.Checked, "#A1");
Assert.AreEqual (CheckState.Unchecked, tsmi.CheckState, "#A2");
tsmi.Checked = true;
Assert.AreEqual (true, tsmi.Checked, "#B1");
Assert.AreEqual (CheckState.Checked, tsmi.CheckState, "#B2");
Assert.AreEqual ("CheckedChanged=True;CheckStateChanged=Checked;", event_log, "#B3");
event_log = String.Empty;
tsmi.CheckState = CheckState.Unchecked;
Assert.AreEqual (false, tsmi.Checked, "#C1");
Assert.AreEqual (CheckState.Unchecked, tsmi.CheckState, "#C2");
Assert.AreEqual ("CheckedChanged=False;CheckStateChanged=Unchecked;", event_log, "#C3");
}
string event_log;
void tsmi_CheckedChanged (object sender, EventArgs e)
{
event_log += "CheckedChanged=" + ((ToolStripMenuItem)sender).Checked + ";";
}
void tsmi_CheckStateChanged (object sender, EventArgs e)
{
event_log += "CheckStateChanged=" + ((ToolStripMenuItem)sender).CheckState + ";";
}
}
}
#endif
@@ -283,6 +283,33 @@ namespace MonoTests.System.Windows.Forms
Assert.AreEqual(handle, handle, "Removes warning");
}
[Test]
public void EventsTest ()
{
TrackBar trackbar = new TrackBar ();
trackbar.Maximum = 10;
trackbar.Minimum = 1;
trackbar.LargeChange = 2;
trackbar.ValueChanged += new EventHandler (trackbar_ValueChanged);
trackbar.Scroll += new EventHandler (trackbar_Scroll);
trackbar.Value = 6;
Assert.AreEqual ("ValueChanged=6;", event_log, "#A1");
}
string event_log;
void trackbar_Scroll (object sender, EventArgs e)
{
event_log += "Scroll=" + ((TrackBar)sender).Value + ";";
}
void trackbar_ValueChanged (object sender, EventArgs e)
{
event_log += "ValueChanged=" + ((TrackBar)sender).Value + ";";
}
}
}
@@ -1,60 +1,60 @@
Mono.Debugger/CustomAttributeTypedArgumentMirror.cs
Mono.Debugger/ExceptionEvent.cs
Mono.Debugger/ModuleMirror.cs
Mono.Debugger/AppDomainMirror.cs
Mono.Debugger/AssemblyLoadEvent.cs
Mono.Debugger/VMStartEvent.cs
Mono.Debugger/StackFrame.cs
Mono.Debugger/CustomAttributeDataMirror.cs
Mono.Debugger/ThreadStartEvent.cs
Mono.Debugger/ILInstruction.cs
Mono.Debugger/PrimitiveValue.cs
Mono.Debugger/VMDisconnectedException.cs
Mono.Debugger/Mirror.cs
Mono.Debugger/EnumMirror.cs
Mono.Debugger/FieldInfoMirror.cs
Mono.Debugger/TypeMirror.cs
Mono.Debugger/CustomAttributeNamedArgumentMirror.cs
Mono.Debugger/DataConverter.cs
Mono.Debugger/AssemblyMirror.cs
Mono.Debugger/VirtualMachine.cs
Mono.Debugger/VMMismatchException.cs
Mono.Debugger/AppDomainUnloadEvent.cs
Mono.Debugger/ExceptionEventRequest.cs
Mono.Debugger/EventType.cs
Mono.Debugger/StructMirror.cs
Mono.Debugger/InvocationException.cs
Mono.Debugger/IMirror.cs
Mono.Debugger/VMDeathEvent.cs
Mono.Debugger/MethodBodyMirror.cs
Mono.Debugger/MethodEntryEvent.cs
Mono.Debugger/MethodMirror.cs
Mono.Debugger/BreakpointEventRequest.cs
Mono.Debugger/MethodEntryEventRequest.cs
Mono.Debugger/LocalVariable.cs
Mono.Debugger/ParameterInfoMirror.cs
Mono.Debugger/Event.cs
Mono.Debugger/AppDomainCreateEvent.cs
Mono.Debugger/ThreadDeathEvent.cs
Mono.Debugger/SuspendPolicy.cs
Mono.Debugger/VirtualMachineManager.cs
Mono.Debugger/MethodExitEvent.cs
Mono.Debugger/MethodExitEventRequest.cs
Mono.Debugger/EventQueueImpl.cs
Mono.Debugger/ObjectMirror.cs
Mono.Debugger/Value.cs
Mono.Debugger/StepEvent.cs
Mono.Debugger/Location.cs
Mono.Debugger/ObjectCollectedException.cs
Mono.Debugger/EventRequest.cs
Mono.Debugger/InvalidStackFrameException.cs
Mono.Debugger/BreakpointEvent.cs
Mono.Debugger/StringMirror.cs
Mono.Debugger/PropertyInfoMirror.cs
Mono.Debugger/ArrayMirror.cs
Mono.Debugger/StepEventRequest.cs
Mono.Debugger/Connection.cs
Mono.Debugger/ThreadMirror.cs
Mono.Debugger/TypeLoadEvent.cs
Mono.Debugger/VMDisconnectEvent.cs
Mono.Debugger/InvokeOptions.cs
Mono.Debugger.Soft/CustomAttributeTypedArgumentMirror.cs
Mono.Debugger.Soft/ExceptionEvent.cs
Mono.Debugger.Soft/ModuleMirror.cs
Mono.Debugger.Soft/AppDomainMirror.cs
Mono.Debugger.Soft/AssemblyLoadEvent.cs
Mono.Debugger.Soft/VMStartEvent.cs
Mono.Debugger.Soft/StackFrame.cs
Mono.Debugger.Soft/CustomAttributeDataMirror.cs
Mono.Debugger.Soft/ThreadStartEvent.cs
Mono.Debugger.Soft/ILInstruction.cs
Mono.Debugger.Soft/PrimitiveValue.cs
Mono.Debugger.Soft/VMDisconnectedException.cs
Mono.Debugger.Soft/Mirror.cs
Mono.Debugger.Soft/EnumMirror.cs
Mono.Debugger.Soft/FieldInfoMirror.cs
Mono.Debugger.Soft/TypeMirror.cs
Mono.Debugger.Soft/CustomAttributeNamedArgumentMirror.cs
Mono.Debugger.Soft/DataConverter.cs
Mono.Debugger.Soft/AssemblyMirror.cs
Mono.Debugger.Soft/VirtualMachine.cs
Mono.Debugger.Soft/VMMismatchException.cs
Mono.Debugger.Soft/AppDomainUnloadEvent.cs
Mono.Debugger.Soft/ExceptionEventRequest.cs
Mono.Debugger.Soft/EventType.cs
Mono.Debugger.Soft/StructMirror.cs
Mono.Debugger.Soft/InvocationException.cs
Mono.Debugger.Soft/IMirror.cs
Mono.Debugger.Soft/VMDeathEvent.cs
Mono.Debugger.Soft/MethodBodyMirror.cs
Mono.Debugger.Soft/MethodEntryEvent.cs
Mono.Debugger.Soft/MethodMirror.cs
Mono.Debugger.Soft/BreakpointEventRequest.cs
Mono.Debugger.Soft/MethodEntryEventRequest.cs
Mono.Debugger.Soft/LocalVariable.cs
Mono.Debugger.Soft/ParameterInfoMirror.cs
Mono.Debugger.Soft/Event.cs
Mono.Debugger.Soft/AppDomainCreateEvent.cs
Mono.Debugger.Soft/ThreadDeathEvent.cs
Mono.Debugger.Soft/SuspendPolicy.cs
Mono.Debugger.Soft/VirtualMachineManager.cs
Mono.Debugger.Soft/MethodExitEvent.cs
Mono.Debugger.Soft/MethodExitEventRequest.cs
Mono.Debugger.Soft/EventQueueImpl.cs
Mono.Debugger.Soft/ObjectMirror.cs
Mono.Debugger.Soft/Value.cs
Mono.Debugger.Soft/StepEvent.cs
Mono.Debugger.Soft/Location.cs
Mono.Debugger.Soft/ObjectCollectedException.cs
Mono.Debugger.Soft/EventRequest.cs
Mono.Debugger.Soft/InvalidStackFrameException.cs
Mono.Debugger.Soft/BreakpointEvent.cs
Mono.Debugger.Soft/StringMirror.cs
Mono.Debugger.Soft/PropertyInfoMirror.cs
Mono.Debugger.Soft/ArrayMirror.cs
Mono.Debugger.Soft/StepEventRequest.cs
Mono.Debugger.Soft/Connection.cs
Mono.Debugger.Soft/ThreadMirror.cs
Mono.Debugger.Soft/TypeLoadEvent.cs
Mono.Debugger.Soft/VMDisconnectEvent.cs
Mono.Debugger.Soft/InvokeOptions.cs
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class AppDomainCreateEvent : Event {
AppDomainMirror domain;
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class AppDomainMirror : Mirror
{
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class AppDomainUnloadEvent : Event {
AppDomainMirror domain;
@@ -2,7 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class ArrayMirror : ObjectMirror, IEnumerable {
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class AssemblyLoadEvent : Event {
AssemblyMirror assembly;
@@ -3,7 +3,7 @@ using System.Reflection;
using Mono.Debugger;
using Mono.Cecil;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class AssemblyMirror : Mirror
{
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class BreakpointEvent : Event {
MethodMirror method;
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public sealed class BreakpointEventRequest : EventRequest {
@@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Text;
using Mono.Cecil.Metadata;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
class VersionInfo {
public string VMVersion {
@@ -6,7 +6,7 @@ using System.Reflection;
using System.Text;
using Mono.Cecil.Metadata;
namespace Mono.Debugger {
namespace Mono.Debugger.Soft {
public sealed class CustomAttributeDataMirror {
MethodMirror ctorInfo;
@@ -2,7 +2,7 @@ using System;
using System.Runtime.InteropServices;
using System.Reflection;
namespace Mono.Debugger {
namespace Mono.Debugger.Soft {
public struct CustomAttributeNamedArgumentMirror {
CustomAttributeTypedArgumentMirror arg;
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
using System.Collections.ObjectModel;
using System.Reflection;
namespace Mono.Debugger {
namespace Mono.Debugger.Soft {
public struct CustomAttributeTypedArgumentMirror {
Type type;
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
/*
* Represents an enum value in the debuggee
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public abstract class Event {
protected VirtualMachine vm;
@@ -8,7 +8,7 @@ using Mono.Debugger;
using Mono.Debugger.Requests;
using Mono.Debugger.Events;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
class EventQueueImpl : MirrorImpl, EventQueue
{
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public abstract class EventRequest {
protected int id;
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
// Keep it in sync with debugger-agent.h
public enum EventType {
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class ExceptionEvent : Event {
ObjectMirror exc;
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public sealed class ExceptionEventRequest : EventRequest {
@@ -5,7 +5,7 @@ using System.Reflection;
using C = Mono.Cecil;
using Mono.Cecil.Metadata;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class FieldInfoMirror : Mirror {
@@ -6,7 +6,7 @@ using Mono.Cecil.Metadata;
using System.IO;
using System.Reflection;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
/*
* This is similar to the Instruction class in Cecil, we can't use that
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
/*
* A Mirror represents a runtime object in the remote virtual machine. Calling
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class InvalidStackFrameException : Exception {
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class InvocationException : Exception {
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
[Flags]
public enum InvokeOptions {
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class LocalVariable : Mirror {
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class Location : Mirror
{
@@ -6,7 +6,7 @@ using Mono.Cecil.Metadata;
using System.IO;
using System.Reflection;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class MethodBodyMirror : Mirror
{
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class MethodEntryEvent : Event {
MethodMirror method;
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public sealed class MethodEntryEventRequest : EventRequest {
@@ -1,5 +1,5 @@
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public class MethodExitEvent : Event {
MethodMirror method;
@@ -1,6 +1,6 @@
using System;
namespace Mono.Debugger
namespace Mono.Debugger.Soft
{
public sealed class MethodExitEventRequest : EventRequest {
Loaded 100 of 501 files, more files were not shown because too many files have changed in this diff. Show more