Compare commits

..
Author SHA1 Message Date
Marek Safar 6bf50d107b Implements is operator with expression as type 2013-09-04 11:28:02 +02:00
Marek Safar 98aef175b2 Add core of PS String type 2013-09-02 19:52:58 +02:00
Marek Safar cfbb707d77 Fixes catch of dynamic type 2013-08-30 16:59:51 +02:00
Marek Safar 26b44adfee Fixes handling of parameterless functions 2013-08-30 16:36:21 +02:00
Marek Safar 7cc63291b9 Implements strict binary operators in dynamic context 2013-08-30 16:27:01 +02:00
Marek Safar 242738b9b4 Initial version of strict operators 2013-08-29 18:31:12 +02:00
Marek Safar 23daaa8f3d Implements untyped parameters 2013-08-29 14:40:13 +02:00
Marek Safar d26916f86c Implements expression series 2013-08-28 11:19:17 +02:00
Marek Safar 96debf77d1 Implements simple catch blocks, package fields 2013-08-27 16:28:04 +02:00
Marek Safar 26831a86d2 Fixes failing test 2013-08-27 10:54:06 +02:00
Marek Safar 281208244f Enable fixed test 2013-08-27 10:44:45 +02:00
Marek Safar 88eb6b008e Fix invalid code 2013-08-27 10:42:42 +02:00
Marek Safar 87048f03df Merge remote-tracking branch 'origin/master' into playscript-mono 2013-08-27 10:31:43 +02:00
Marek Safar 982f710571 Invalid syntax during attribute target parsing can crash parser. Fixes #14245 2013-08-27 10:20:56 +02:00
Miguel de Icaza fd12f0b05e Console.iOS: add fallback for the case where monotouch_log is not linked in 2013-08-26 23:22:35 -04:00
Michael Hutchinson b2cc26aa81 Merge pull request #742 from remobjects/import-project-userfile
Import ".user" as if it was part of the project, this lets users overrid...
2013-08-26 12:19:28 -07:00
Carlo Kok 60fd58a157 Import ".user" as if it was part of the project, this lets users override the options without checking changes to the main project file. 2013-08-26 17:53:46 +02:00
Marek Habersack 4ec59639b7 Merge pull request #726 from pruiz/xamarin-bug-13708
Fixed xamarin bug #13708: ASP.NET routing constraints should be treated as 'convertible to string' in order to be compat with MS.NET
2013-08-26 05:20:46 -07:00
Marek Safar 8e5e7ea505 Merge pull request #741 from marcominetti/master
Clean verbose (debug) logs in mcs for MakeExpression function call
2013-08-26 04:08:55 -07:00
marcominetti 94e8ad6ef0 cleaned console logs in MakeExpression function
Cleaned verbose logs leftovers (probably debug ones) that are currently printed on every compiling that involves dynamic objects...
2013-08-26 12:47:16 +02:00
marcominetti cf0b31248a cleaned console logs in MakeExpression function
Cleaned verbose logs leftovers (probably debug ones) that are currently printed on every compiling that involves dynamic objects...
2013-08-26 12:46:34 +02:00
Marek Safar 16013bc247 Merge pull request #740 from pruiz/dataannotations-enhancements
Some enhancements and additions to DataAnnotations, incluiding implementation of a few missing pieces of Sys.ComponentModel.DataAnnotations v4.5, like:
2013-08-26 02:59:07 -07:00
Pablo Ruiz Garcia 71d6896925 Reverted string.Format(CultureInfo.CurrentCulture, ..) change. 2013-08-26 11:42:02 +02:00
Marek Safar 8c2c29d41c Add test for #12745 2013-08-26 11:13:03 +02:00
Pablo Ruiz Garcia 46e571eaf1 Set correct author on test files. 2013-08-25 17:28:59 +02:00
Pablo Ruiz Garcia eb25dfce5c Some enhancements and additions to DataAnnotations, incluiding implemented of a few missing pieces of Sys.ComponentModel.DataAnnotations v4.5, like:
- CompareAttribute
	- CreditCardAttribute
	- EmailAddressAttribute
	- FileExtensionsAttribute
	- PhoneAttribute
	- Implemented  IsValid() methods of Min/MaxLengthAttribute.
	- Fixed all existing Validation attributes so they take into account current's locale when composing ErrorMessage.
2013-08-25 03:42:30 +02:00
Sebastien Pouliot 0d864b08c0 SRE.ParameterBuilder cannot be exposed in FULL_AOT_RUNTIME 2013-08-24 11:33:42 -04:00
Rodrigo Kumpera 3b846d3d4c We have g_getenv for portability reasons, so let's use it. 2013-08-23 18:23:27 -04:00
Zoltan Varga 722ace9131 Fix yet another DISABLE_JIT bug in wrapper generation. Fixes #14194. 2013-08-23 23:17:41 +02:00
Marek Safar 20d08fd8da Annonymous method storey inside async storey has to capture this directly when the storey does not have any parents. Fixes #14126 2013-08-23 13:27:21 +02:00
Rodrigo Kumpera 29c42bf0dc Add tests for the new 4.0 behavior in ParameterInfo. 2013-08-22 16:00:15 -04:00
Rodrigo Kumpera 3673d051fb [corlib]Implement .net 4.0 ParameterInfo. 2013-08-22 16:00:14 -04:00
Marek Safar cfa7bad1d7 Fixes negative symbol definition for few locales to be simple -. Fixes #14185 2013-08-22 19:12:47 +02:00
Zoltan Varga 33bd2503de Disable two delegate tests on mobile. 2013-08-22 18:57:06 +02:00
Marek Safar 95a6979c3b Enable fixed failing test 2013-08-22 17:50:22 +02:00
Neale Ferguson 9bcd33f029 Enable INLINE support for s390x 2013-08-22 08:17:24 -04:00
Sebastien Pouliot b46b038f33 Fix test case not to assume it can write in the current directory 2013-08-21 19:54:09 -04:00
Mark Probst 7770413fac [sgen] Disable cementing for parallel mark&sweep.
Cementing isn't parallel-ready yet.
2013-08-21 16:24:03 -07:00
Sebastien Pouliot f2e7f36368 Use the invarient culture calendar if the requested one is not available. Partial fix for #13977 2013-08-21 14:15:39 -04:00
Atsushi Eno 41290d39db Fix bug #14143 - xsl:import in included stylesheet caused compilation error.
Simply ignoring xsl:import causes regression in
XslTransformTests.ImportIncorrectlyLocated so no-go. The actual error for
that case is now reported better (not just "unrecognized element").
2013-08-22 02:15:24 +09:00
Rodrigo Kumpera a700784767 [runtime] Don't allow execution of dynamic assemblies without run access. Fixes #7126 2013-08-21 12:08:11 -04:00
Rodrigo Kumpera de2efdbd0f [corlib]Fix 2.0 test suite breakage. 2013-08-21 10:52:08 -04:00
Rodrigo Kumpera d71ca46641 [verifier]Remove duplicate check. 2013-08-21 10:22:31 -04:00
Marek Safar 91e22b4d37 Implements type initializers 2013-08-21 16:14:38 +02:00
Atsushi Eno 2d6335f6a7 revert default serialization: ignore non-public members. Also need to exclude backing field in non-default serialization. 2013-08-21 15:44:27 +09:00
Rodrigo Kumpera bfff327c10 [runtime]Add some error checking to custom attr parsing and plug a memory leak. Fixes #13435. 2013-08-20 19:10:45 -04:00
Zoltan Varga 8cb8add995 Make the dmcs/gmcs scripts identical to the mcs script with an extra -sdk: argument, to avoid PATH problems, and to allow the windows installer to generate .bat files for them. Hopefully fixes #8813. 2013-08-21 00:57:28 +02:00
Rodrigo Kumpera e0c4e5bf88 [runtime] Handle custom attributes with nested array of enums. Fixes #13767
When decoding a custom attribute value, an array value in an object
position can have type of an enum.
2013-08-20 18:34:08 -04:00
Zoltan Varga 0152cee92d Use i686-pc-mingw32-gcc as the mkbundle compiler on windows. 2013-08-21 00:24:26 +02:00
Zoltan Varga 7685ca6271 Merge pull request #737 from Mixaill/master
Remove deprecated -mno-cygwin flag.
2013-08-20 15:20:14 -07:00
Rodrigo Kumpera ac146cb037 [verify]Relax the restriction on global methods visibility. Fixes #13890. 2013-08-20 15:49:24 -04:00
Rodrigo Kumpera c187e5ea14 [verifier]Since 4.5 arrays now implement IReadOnlyList<T> and IReadOnlyCollection<T>. Verify this properly. Fixes #13879. 2013-08-20 14:47:55 -04:00
Zoltan Varga ba8d128834 Add support for more return types for constrained gsharedvt calls. Fixes #13030. 2013-08-20 19:50:29 +02:00
Zoltan Varga c686f20fbe Enable support for constrained gsharedvt calls to Object.GetType (). 2013-08-20 19:09:31 +02:00
Zoltan Varga 74fc821cf6 Fix a regression introduced by d84a165c8e. Unbox casts were failing for enums. Fixes #14026. 2013-08-20 16:08:32 +02:00
Paolo Molaro e50f95626b Merge pull request #739 from mono/upstream-master
Ported perf code to work on arm and adjusted to changes in the kernel th...
2013-08-20 06:10:07 -07:00
Paolo Molaro 25961ac5cf Ported perf code to work on arm and adjusted to changes in the kernel that broke mmap().
The kernel doesn't allow anymore to setup a perf fd with any cpu and the inherit flag
(to take into account threads created later on), so now we setup a fd/mmap area for each
cpu in the system.
2013-08-20 14:50:47 +02:00
Marek Safar 9c1b3cba34 Redo field initialization to allow ordered statements be part of type initialization 2013-08-20 10:44:35 +02:00
Zoltan Varga f36257e03b [aot] Add support for constrained gsharedvt calls which return a reference value. Fixes #13030. 2013-08-20 01:30:10 +02:00
Marek Safar cabe0f95ed Merge pull request #738 from strawd/bug14077
Fix for #14077. HashSet no longer grows in capacity on deserialize
2013-08-19 13:05:16 -07:00
David Straw a257338394 Fix for #14077. HashSet no longer grows in capacity on deserialize
Not all necessary members were being initialized during deserialization
2013-08-19 13:48:17 -06:00
Rodrigo Kumpera 2bec46815c [runtime]Fix mono-config.h to use the mono API public types and not the glib ones. 2013-08-19 15:40:05 -04:00
Alex Rønne Petersen 4a61680549 Add an #else -> #error path to mono-membar.h. 2013-08-19 21:30:40 +02:00
Jeffrey Stedfast 7694b5dbae Only disable __thread with clang on Mac OS X 2013-08-19 11:30:31 -04:00
Marek Safar 1269b409b3 Add argument modifiers to generated base proxy when needed. Fixes #13892 2013-08-19 13:22:13 +02:00
Marek Safar cbca01b433 Add dispose checks to ReaderWriterLockSlim and fix race in currentThreadState initialization 2013-08-19 10:22:23 +02:00
Marek Safar 1fe24728bd Optimize common path 2013-08-19 10:22:22 +02:00
Atsushi Eno 88dadaaf10 Revert "Revert "Fix bug #7829 - do NOT reject ConstructorInfo in DynamicILInfo.GetTokenFor().""
This reverts commit 0ef5f49c1f.
2013-08-19 12:13:38 +09:00
Michael Pavlyshko 52a67a6219 Remove deprecated -mno-cygwin flag. 2013-08-18 21:12:14 +03:00
Atsushi Eno 0ef5f49c1f Revert "Fix bug #7829 - do NOT reject ConstructorInfo in DynamicILInfo.GetTokenFor()."
This reverts commit b43211d101.
2013-08-18 15:34:37 +09:00
Atsushi Eno b43211d101 Fix bug #7829 - do NOT reject ConstructorInfo in DynamicILInfo.GetTokenFor().
It is only one of probably many reasons that prevents Jurassic JavaScript engine.
2013-08-18 15:31:40 +09:00
Marek Safar 6508d62869 Grow underlying buffer only when necessary. Fixes #13552 2013-08-17 16:31:45 +02:00
Marek Safar 8ab849eb82 More untyped and default values handling 2013-08-17 12:05:13 +02:00
Marek Safar 70b14ec733 Report error for name collision between property and generic method with same name. Fixes #14053 2013-08-17 11:14:33 +02:00
Marek Safar e9f871dfe4 Merge pull request #736 from wtfrank/charting
add missing ZTestResult properties
2013-08-17 01:39:41 -07:00
Francis Fisher ada7e135c9 add missing ZTestResult properties 2013-08-17 08:36:49 +01:00
Marek Safar f81e067e01 Fixes GZipStream dispose order. Fixes #14032 2013-08-16 23:16:23 +02:00
Zoltan Varga cad5315ebf Convert nan/infinity to uint 0 to match MS.NET. Fixes #13927. 2013-08-16 19:48:55 +02:00
Rodrigo Kumpera e86837b7d2 Merge pull request #725 from knocte/threadpool_init
[ThreadPool] Allow heavier initialization when using --server flag
2013-08-16 06:21:31 -07:00
Marek Safar a208b628e9 Implements lifted nullable comparison with null 2013-08-16 15:18:49 +02:00
Marek Safar 1044b36c14 Rewrites RuntimeReflectionExtensions to actually do something. Fixes #13626 2013-08-16 11:14:50 +02:00
Marek Safar f9391f934a Disable test failing due to runtime bug 2013-08-16 10:13:29 +02:00
Zoltan Varga a8cbb84a2c Simplify the caching of delegate-invoke wrappers with a bound first argument, caching can be done using just the signature. 2013-08-16 03:10:52 +02:00
Zoltan Varga 8d291a2e77 Merge pull request #734 from joncham/domain-debug-leaks
Fix domain related leaks of debug information
2013-08-15 17:53:33 -07:00
Marek Safar 6a4dcd4f6c Fixed repl version 2013-08-15 19:03:18 +02:00
Marek Safar f117b64a5d Merge remote-tracking branch 'origin/master' into playscript-mono 2013-08-15 18:27:34 +02:00
Marek Safar 0c8d56025e Remove some unused parameters 2013-08-15 18:06:36 +02:00
Marek Safar b05f24e810 Type parameter inflated interfaces needs to be marked too. Fixes #13996 2013-08-15 16:59:10 +02:00
Atsushi Eno 349c84032e Fix regression from 2cc36e3, missing BaseURI caused external schema resolution failure. 2013-08-15 22:09:49 +09:00
Marek Safar 17a8120548 Correct parsing of invalid 00000000-0000-0000-0000-000000000000 guid format. Fixes #13970 2013-08-15 12:18:36 +02:00
Marek Safar 4060edb4fa Small optimization of GuidParser 2013-08-15 11:41:05 +02:00
Marek Safar 0e9c53b052 Workaround for legacy nunit 2013-08-15 11:17:02 +02:00
Marek Safar 9d94a06e6a Inflate explicit delegate parameters using type inference context too. Fixes second part of #13969 2013-08-15 11:03:15 +02:00
Atsushi Eno 37e7f2fb50 Fix build (giconv.c) 2013-08-15 13:18:16 +09:00
Jeffrey Stedfast a81cd6dae8 [eglib] Fixed g_utf8_to_utf16_general() to handle invalid utf8 2013-08-14 19:41:38 -04:00
Rodrigo Kumpera 384f1d8af5 Add tests for the recently fixed issues with block guards. 2013-08-14 19:23:34 -04:00
Rodrigo Kumpera a385a2bac2 [runtime]Generate the proper exit code for block guard trampolines.
Finally blocks use a non-standard calling convention which means we need to take it
into account in the return address hijacking trampoline.

A finally block is called with ESP % 16 == 4. Once inside the finally block, ESP returns
to be % 16 == 0 due to the call instruction pushing the return address.

The problem comes when we want to hijack the return address. Our trampolines expect a
normal calling convention with ESP properly aligned, so we use a small thunk of code that
does that before jumping into the trampoline itself. This is required as we'll enter native.

The problem lies on the exit path as the trampoline jump to an arbitrary place instead back
to the above thunk. This leaves the stack with the thunk adjustment in, which will cause
the resulting code to misalign the stack even further.

The solution, though a big ugly, is to change the exit path of the trampoline fix the stack
to be "properly" misaligned.
2013-08-14 19:05:33 -04:00
Rodrigo Kumpera 58e8550d5c [runtime]Properly compute the end address of a finally block when it ends in a dead basic-block.
We compute the end address of a finally block by using cil_offset_to_bb, which can point to dead
basic blocks if those were killed by CFG simplification.
2013-08-14 19:05:26 -04:00
Rodrigo Kumpera 93b0f40d43 [runtime] Make sure mono_create_handler_block_trampoline is async signal safe.
We call mono_create_handler_block_trampoline when installing the block guard,
so this function must be async safe at that stage in the runtime.

Since it is eagerly called during startup, we should be fine with just
memory barriers.
2013-08-14 19:05:19 -04:00
Zoltan Varga 516c4d85f5 Add a WrapperInfo for delegate-invoke wrappers to make it possible to distinguish between normal wrappers and ones with a bound first argument. 2013-08-14 22:59:32 +02:00
Marek Safar c7a91f9309 Add test for #13969 2013-08-14 21:54:49 +02:00
Marek Safar 2b39b6a926 Fix recursive check for non dependent return types during type inference. Fixes #13969 2013-08-14 21:53:30 +02:00
Mark Probst 00f152cfc4 Fixed a few bugs that were found by Visual Studio's static code analysis. 2013-08-14 11:22:59 -07:00
Mark Probst 6a14275371 [sgen] Fix another posix handshake issue. 2013-08-14 11:04:28 -07:00
Jonathan Chambers effa6dcf44 Free domain specific sequence point information.
Conflicts:
	mono/mini/mini.c
2013-08-14 13:10:23 -04:00
Jonathan Chambers 5047a9c314 Free returned offsets and line numbers from mono_debug_symfile_get_line_numbers. 2013-08-14 13:07:38 -04:00
Marek Safar 4f021d81ca Merge pull request #733 from amoiseev-softheme/bugfix/monofix
Applying fixes to Https from Windows team to mono
2013-08-14 06:46:41 -07:00
Marek Safar 64dcc45998 Don't crash when reporting invalid case label value. Fixes #13952 2013-08-14 15:32:21 +02:00
Alexey Moiseev 26099534a0 Applying fixes to Https from Windows team to mono 2013-08-14 16:28:19 +03:00
Marek Safar e789b6abbb Implements namespaces at package level 2013-08-14 10:36:53 +02:00
Marek Safar 2940861c80 Merge pull request #732 from wtfrank/charting
placement of MonoTODO
2013-08-14 00:48:17 -07:00
Francis Fisher 6930f1a8ee placement of MonoTODO 2013-08-14 00:14:23 +01:00
Zoltan Varga a31b580fdc [sgen] Add a workaround for #13951. Register the jit info for GC critical methods as soon as they are loaded, and avoid lookups in the AOT images when calling mono_jit_info_table_find () during STW. 2013-08-14 00:15:16 +02:00
Zoltan Varga fd80c70838 Fix a warning. 2013-08-14 00:15:16 +02:00
Marek Safar 18068d5b4f Merge pull request #729 from wtfrank/charting-submit
Continued implementation of Charting namespace
2013-08-13 12:42:18 -07:00
Jeffrey Stedfast 2f19eee32f Fixed configure.in to fail the __thread check with clang 2013-08-13 15:34:12 -04:00
Miguel de Icaza cca57fa576 Add System.DirectoryServices.Protocols to the rpm build to fix the bots 2013-08-13 15:00:18 -04:00
Jeffrey Stedfast 9fd216db06 Fixed some compiler warnings in libgc 2013-08-13 13:12:59 -04:00
Jeffrey Stedfast b609cbb543 Replaced call to sscanf() with calls to strtoull(). Better. Faster. Stronger. 2013-08-13 12:46:50 -04:00
Jonathan Pryor bd130f3a2c [mscorlib] Support OID names in RSACryptoServiceProvider.SignData()
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=13953

MSDN documents that RSACryptoServiceProvider.SignData()'s provider
paramter may contain an OID name:

http://msdn.microsoft.com/en-us/library/y2wf1b6k.aspx
> The halg parameter can accept a String, a HashAlgorithm, or a Type.
> The string value can be one of the following:
> * The object identifier (OID) friendly name of the hash algorithm to use,
>   either a name registered in the crypto config file or one in the
>   Crypto API OID table.
> * The OID value. The OID must be one recognized by the Crypto API.
> For example, you could use SignData(new byte[5], "1.3.14.3.2.26") or
> SignData(new byte[5], "sha1"), or SignData(new byte[5], "SHA1").

Add support for this OID names as the provider.
2013-08-13 12:09:56 -04:00
Jeffrey Stedfast 91bf902e2e Improved fix for g_iconv() compiler warnings 2013-08-13 11:59:52 -04:00
Jeffrey Stedfast 82219acd3c Fixed eglib compiler warnings about g_string_truncate() and g_iconv() 2013-08-13 11:44:58 -04:00
Jeffrey Stedfast 94f12d815e Fixed some compiler warnings 2013-08-13 11:24:21 -04:00
Rolf Bjarne Kvinge 2448e73caa Revert "Fix a test to work on mobile after the async release."
This reverts commit b22667cd23.

It was a build bug in monotouch, not a buggy test.
2013-08-13 13:21:22 +02:00
Zoltan Varga 92d3a7b0b6 Fix 5d37fac7c8 yet again. 2013-08-13 12:29:45 +02:00
Zoltan Varga fad3d7f588 [msvc] Implement MONO_CONTEXT_GET_CURRENT () on the msvc build. 2013-08-13 03:34:06 +02:00
Zoltan Varga c0365e5748 Fix warnings. 2013-08-13 03:34:06 +02:00
Zoltan Varga c98df65bfa [msvc] Avoid linking against libgc in the sgen configurations. 2013-08-13 03:34:05 +02:00
Rolf Bjarne Kvinge af8e11988d Only build mscorlib in the monotouch_runtime profile. 2013-08-13 00:34:58 +02:00
Zoltan Varga 398c7fc21f [sgen] Disable freeing of OS memory on win32, it causes asserts because VirtualFree () fails. 2013-08-12 23:23:57 +02:00
Jonathan Pryor 0e7dc370e3 [System.Core/Android] Android's libc.so doesn't export getpagesize()
Partially fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=12739

Android's libc.so doesn't export getpagesize(3), resulting in an
EntryPointNotFoundException:

	System.EntryPointNotFoundException: getpagesize
	  at (wrapper managed-to-native) System.IO.MemoryMappedFiles.MemoryMapImpl.getpagesize ()
	  at System.IO.MemoryMappedFiles.MemoryMapImpl.Map (int,long,long&,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,intptr&,int&)
	  at System.IO.MemoryMappedFiles.MemoryMappedViewAccessor.Create (long,long,System.IO.MemoryMappedFiles.MemoryMappedFileAccess)
	  at System.IO.MemoryMappedFiles.MemoryMappedViewAccessor..ctor (int,long,long,System.IO.MemoryMappedFiles.MemoryMappedFileAccess)
	  at System.IO.MemoryMappedFiles.MemoryMappedFile.CreateViewAccessor (long,long,System.IO.MemoryMappedFiles.MemoryMappedFileAccess)

Android does provide getpagesize(3); it's just an inline function.

The full fix will require two parts:

 1. Update MemoryMapImpl to P/Invoke
    libmonodroid.so!monodroid_getpagesize()
 2. Add a libmonodroid.so!monodroid_getpagesize() export.

This commit implements (1).
2013-08-12 16:59:14 -04:00
Sebastien Pouliot 2ab52ceae2 [linker] Add AssemblyAction.Save to enable the linker to re-write an assembly without actually linking it. Useful to remove references to PCL assemblies that are not really used (e.g. when only type forwarders are needed) [#13488] 2013-08-12 15:31:33 -04:00
Sebastien Pouliot 27e36aef37 [linker] Small string optimizations to avoid culture aware code paths 2013-08-12 15:31:33 -04:00
Zoltan Varga f447c860f5 [aot] Align the static linking symbol. 2013-08-12 21:10:13 +02:00
Francis Fisher c529dc59df fix properties per mono guidelines 2013-08-12 19:48:20 +01:00
Zoltan Varga 56a02b9285 Merge pull request #708 from spicypixel/hotfix/mono-object-to-string
Add support for value types to mono_object_to_string
2013-08-12 11:17:07 -07:00
Jonathan Lima d0715eeb4b Fixed SGen build for MSVC
From:
https://github.com/mono/mono/pull/724
2013-08-12 19:57:02 +02:00
Jonathan Lima 0585e7cb9a Fixed incorrect pointer arithmetic on SGen for MSVC.
From:
https://github.com/mono/mono/pull/724
2013-08-12 19:53:21 +02:00
Jonathan Lima 9883ab8b8a Fixed MSVC build, ported to Visual Studio 2012.
From:

https://github.com/mono/mono/pull/724
2013-08-12 19:48:05 +02:00
Jonathan Lima d5b8fd8e6d Improved exception handling with vectored exception handling.
Now a native debugger can be used with soft debugger running without triggering any exception. Code provided by Jonathan Chambers:

* https://github.com/Unity-Technologies/mono/commit/e9f9f7170914c5caaff3e95e09f6f58ecced2a10
* https://github.com/Unity-Technologies/mono/commit/4c2e1db60ccb38e792545d595d85b12ff309a919
* https://github.com/Unity-Technologies/mono/commit/bd7e534aa7da49b89787b8c1b40e165a34c0e960
* https://github.com/Unity-Technologies/mono/commit/b885251a83969d243deabc56bb3d1495d4a971dc

From:

https://github.com/mono/mono/pull/724
2013-08-12 19:46:06 +02:00
Jeffrey Stedfast 51b648a118 Fixed build breakage from my previous commit 2013-08-12 12:12:47 -04:00
Jeffrey Stedfast b1d7375726 Fixed System.Text.Decoder.GetChars(byte*,int,char*,int,bool) to copy output into the char* buffer. 2013-08-12 08:22:49 -04:00
Zoltan Varga b5188e8b4e Get rid of the annoying 'PLATFORM is not defined.' message on every build. 2013-08-12 01:26:54 +02:00
Zoltan Varga 7839312e84 Avoid infinite logfiles if the test-process-exit test fails to terminate. 2013-08-12 01:14:13 +02:00
Zoltan Varga 529b920b35 Fix skipping of disabled runtime tests on windows. 2013-08-12 00:48:38 +02:00
Zoltan Varga 06dea0679d Clean up the win32 lmf code by using a separate variable to hold the jit_tls tls offset. Fix warnings. 2013-08-11 23:19:18 +02:00
Zoltan Varga 21e5a22980 Enable MONO_ARCH_HAS_MONO_CONTEXT on mingw. 2013-08-11 22:46:00 +02:00
Francis Fisher f436736f30 fix up some properties per mono coding guidelines 2013-08-11 18:12:58 +01:00
Francis Fisher 699ef5e948 Boilerplate implementation of Charting
Implemented enough of
System.Windows.Forms.DataVisualization.Charting to get two pieces of
software to compile: the charting examples from MSDN and the windows OSS
EVEMon.

This patch contains the majority of properties defined, and many methods
stubbed - I have avoided implementing any functionality in this patch.

All this work is under the MIT Licence.
2013-08-11 15:07:55 +01:00
Rolf Bjarne Kvinge fa0f423dc5 Fix profile values for monotouch_runtime. 2013-08-10 00:35:10 +02:00
Mark Probst 2c45af25e2 Fix #13604 - STW handshake/thread shutdown race condition. 2013-08-09 13:24:18 -07:00
Marek Safar 7bd34e5715 Add global statements support 2013-08-09 18:46:30 +02:00
Atsushi Eno b62bb260ec Fix bug #4344 - xsl:stylesheet always ignored xsl template contents. 2013-08-09 19:47:20 +09:00
Marek Safar 2f334102cd Add more implicit generic array interfaces. Fixes #8934 2013-08-09 11:56:13 +02:00
Marek Safar ded10b24e9 Update reference file 2013-08-09 11:56:13 +02:00
Atsushi Eno d21b0aa3d9 Fixed bug #4141 - XmlSchemaImporter needs to consider attributeGroupRef in some case. 2013-08-09 17:22:38 +09:00
Zoltan Varga fde407c873 Fix 5d37fac7c8 again. 2013-08-09 10:13:22 +02:00
Atsushi Eno 53a68c9e20 Fixed bug #4668 - C# compiler doesn't like decimal in custom attribute values, so use string. 2013-08-09 17:03:40 +09:00
Atsushi Eno ccab57808d Fix bug #8637 - omit xml declaration for ToString(). 2013-08-09 15:57:35 +09:00
Zoltan Varga 4c0a69874e Remove the usage of gcc-3 on mingw, the gcc-3 package no longer exists on cygwin. Mono can be built by configuring with --host=i686-pc-mingw32. Building without this will not work, since the libtool wrapper executables created by libtool will be unusable, i.e. they exit before the real runtime process exits. 2013-08-09 01:59:46 +02:00
Zoltan Varga ebfd12313e Fix mingw compilation problems. 2013-08-09 01:59:45 +02:00
Zoltan Varga 77f1fafb58 Fix monodis compilation on mingw which is missing some fp classification functions. 2013-08-09 01:59:45 +02:00
Zoltan Varga 04f533820d Make the gc descriptor tests fail consistently if python is not found. 2013-08-09 01:59:44 +02:00
Jonathan Pryor d1fcb53e15 [mdoc-validate] Allow <format/> to have ANY content.
The intent of the <format/> element is to assist encapsulating
arbitrary HTML content within an mdoc(5) container. This frequently
requires having more than _one_ element within the <format/> block.

(WTF was I thinking forgetting the maxOccurs attribute?!)
2013-08-08 16:35:51 -04:00
Marek Safar d41a06ca08 Implement field initializers 2013-08-08 21:19:34 +02:00
Atsushi Eno c65fe47d44 generate mobile csproj files too. 2013-08-08 22:45:07 +09:00
Atsushi Eno 468cb8d277 Build Ix assemblies from rx sources. 2013-08-08 22:07:29 +09:00
Atsushi Eno 2cc36e3331 Fix bug #13716 - use XmlSchemaSettings.XmlResolver to resolve schemas. 2013-08-08 21:38:47 +09:00
Marek Safar 5c55eea17e Basic optional parameters support in binder. Fixes #13817 2013-08-08 13:31:08 +02:00
Marek Safar 09139111a5 Merge pull request #728 from alesliehughes/master
Enable System.DirectoryServices.Protocols assembly
2013-08-08 02:58:22 -07:00
Alistair Leslie-Hughes 1eb75507a6 Enable System.DirectoryServices.Protocols assembly 2013-08-08 19:20:32 +10:00
Marek Safar f2524362fc Always release DeflateStream unmanaged resources. Fixes #13742 2013-08-08 10:29:05 +02:00
Atsushi Eno b5a856e716 Fix bug #11298 - in XElement.Replace*(), create snapshot of content first before removal (unlike it is documented!) 2013-08-08 16:02:03 +09:00
Zoltan Varga 0487904629 [aot] Avoid passing partially shared instances to the JIT. Fixes #13191. 2013-08-08 00:08:51 +02:00
Zoltan Varga 9c65ad34a9 Fix 5d37fac7c8. 2013-08-07 22:51:51 +02:00
Zoltan Varga 5d37fac7c8 [aot] Error out if -O=gsharedvt is used on a platform/configuration where it is not supported. 2013-08-07 21:28:55 +02:00
Marek Safar 56f98e18dd Add block scope for foreach variables with statement only 2013-08-07 20:58:35 +02:00
Marek Safar 0c22492321 Remove NIE from SetWaitNotificationRequired. Fixes #13742 2013-08-07 20:02:03 +02:00
Marek Safar 6a4c57e05b Handle partial class case when nested type of partial container dependends on parent base type from another partial container. Fixes #13731 2013-08-07 19:00:57 +02:00
Atsushi Eno 3e2f5ef8fc Fix bug #10194 - SetElementValue(nonExistentElementName, null) caused NRE. 2013-08-08 01:36:35 +09:00
Atsushi Eno 874d3b1389 Fix bug #12035 - xsi:nil='true' was ignored in some scenario.
"some scenario" I mean:

- There is a sequence with more than one elements in xsd,
- The second element is nillable and its type has content elements, and
- The corresponding XML element specifies xsi:nil='true'

Then it resulted in a validation error as if it were missing the required
content.
2013-08-08 01:00:10 +09:00
Marek Safar 155df94118 Inflate default parameter expression without type checks. Fixes #13793 2013-08-07 15:18:04 +02:00
Rolf Bjarne Kvinge b22667cd23 Fix a test to work on mobile after the async release. 2013-08-07 14:59:12 +02:00
Marek Safar 3448cab291 Update named params parameter converted result expression. Fixes #13786 2013-08-07 12:49:48 +02:00
Atsushi Eno 72d14cca36 Fix bug #12469 - add more conversion methods to XmlAtomicValue.
Since XmlAtomicValue is pretty much hidden in the implementation, there is
almost no way to verify how it should work. So the changes are all based on
assumption. Yet I added a test based on bug #12469.

There is still problem on processing *invalid* inputs. They have to be
rejected, but they pass.
2013-08-07 18:54:03 +09:00
Marek Safar b213facf8e Merge pull request #727 from alesliehughes/master
ActiveDirectory Class and enums
2013-08-06 23:35:12 -07:00
Rodrigo Kumpera b0406462f6 [build]Bring some sanity to the monotouch profiles.
monotouch is now the static profile and it does define FULL_AOT_RUNTIME globally.
2013-08-06 19:00:03 -04:00
Rodrigo Kumpera f9adf72b40 Add support for exclude files in extension modules. 2013-08-06 19:00:03 -04:00
Alistair Leslie-Hughes 72855152a6 Add class DirectoryServicesCOMException 2013-08-07 08:52:08 +10:00
Alistair Leslie-Hughes 3942cbcf71 Add class DirectoryVirtualListView 2013-08-07 08:18:31 +10:00
Alex Rønne Petersen 060669d19a Fix an unlikely case in cmd_to_string () where cmds would be accessed uninitialized. 2013-08-06 21:27:03 +02:00
Alex Rønne Petersen b0b4fdb5ee Fix another strtod warning with #if 0. 2013-08-06 21:23:03 +02:00
Alex Rønne Petersen afef0a0f59 Add two unnecessary zero initializations to shut GCC up.
The conditions are too complex for GCC to realize that these variables
are actually initialized when they're used.
2013-08-06 21:23:03 +02:00
Alex Rønne Petersen dcd27aa93f Kill another mixed-decls-and-code warning. 2013-08-06 21:23:02 +02:00
Marek Safar 1496eac3f4 Create correct flow branching for single non-default switch section. Fixes #13736 2013-08-06 21:07:16 +02:00
Alex Rønne Petersen 19d7806b73 Fix some warnings in strtod by #if 0'ing some unused functions. 2013-08-06 20:53:00 +02:00
Alex Rønne Petersen 5db03c67c1 Fix a warning in dlmalloc by #if 0'ing an unused function. 2013-08-06 20:53:00 +02:00
Alex Rønne Petersen a0bba405d1 Fix a mixed-decls-and-code warning. 2013-08-06 20:53:00 +02:00
Jonathan Pryor 82a197e41c [System.Core/Android] Support Android v4.3's timezone DB format
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=13686

Android v4.3 changed the timezone DB format described in 8a263984 and
replaced it with a single file containing version, index, data, and a
"zoneTab" (which is parsed but unused).

Port/rewrite the Java libcore.util.ZoneInfoDB type into
System.AndroidTzData so that this new file format is supported.

(Another day, another file format...)
2013-08-06 14:27:20 -04:00
Alistair Leslie-Hughes b4f1c73e83 Add class DirectoryVirtualListViewContext 2013-08-06 19:22:05 +10:00
Alistair Leslie-Hughes 261ec28e7c Add class DirectorySynchronization 2013-08-06 19:22:04 +10:00
Alistair Leslie-Hughes c5c858d823 Add enum ExtendedDN 2013-08-06 19:22:02 +10:00
Alistair Leslie-Hughes aa5da06469 Add class ExtendedRightAccessRule 2013-08-06 19:22:01 +10:00
Alistair Leslie-Hughes 6129ec4d09 Add enum DirectorySynchronizationOptions 2013-08-06 19:22:00 +10:00
Alistair Leslie-Hughes 20d02fae27 Add class ForestTrustCollisionException 2013-08-06 19:21:59 +10:00
Alistair Leslie-Hughes 67a116c863 Add class ForestTrustRelationshipCollisionCollection 2013-08-06 19:21:56 +10:00
Alistair Leslie-Hughes aa5657b7fa Add class ForestTrustRelationshipCollision 2013-08-06 19:21:54 +10:00
Alistair Leslie-Hughes f04968359d Add class ListChildrenAccessRule 2013-08-06 19:21:54 +10:00
Alistair Leslie-Hughes c234f6e2dc Add enum ForestTrustCollisionType 2013-08-06 19:21:51 +10:00
Alistair Leslie-Hughes 903d21bac7 Add class ActiveDirectoryServerDownException 2013-08-06 19:21:48 +10:00
Alistair Leslie-Hughes 8263101015 Add class DirectoryEntryConfiguration 2013-08-06 19:21:47 +10:00
Alistair Leslie-Hughes 559570da6d Add enum PasswordEncodingMethod 2013-08-06 19:21:47 +10:00
Alistair Leslie-Hughes 571444246f Add enum DomainCollisionOptions 2013-08-06 19:21:46 +10:00
Alistair Leslie-Hughes 7f50298027 Add class PropertyAccessRule 2013-08-06 19:21:45 +10:00
Alistair Leslie-Hughes 1a2de021ca Add class PropertySetAccessRule 2013-08-06 19:21:44 +10:00
Alistair Leslie-Hughes a9201c5b00 Add enm PropertyAccess 2013-08-06 19:21:42 +10:00
Alistair Leslie-Hughes a6331506cb Add class ReadOnlySiteLinkBridgeCollection 2013-08-06 19:21:42 +10:00
Alistair Leslie-Hughes 5682a6430e Add class ActiveDirectorySiteLinkBridge, ActiveDirectorySiteLinkCollection 2013-08-06 19:21:41 +10:00
Alistair Leslie-Hughes cf17ecb829 Add enum ReplicationSecurityLevel 2013-08-06 19:21:41 +10:00
Alistair Leslie-Hughes e12b9a2c61 Add enum SecurityMasks 2013-08-06 19:21:40 +10:00
Alistair Leslie-Hughes ae40175ca0 Add enum TopLevelNameCollisionOptions 2013-08-06 19:21:39 +10:00
Andrés G. Aragoneses 26d0b81c26 [ThreadPool] Allow heavier initialization when using --server flag
Create on demand up to min_threads to avoid startup penalty, avoiding
throttling of threadpool worker thread creation (for now, using
a --server flag) at initialization.

When throttling happens, operations such as parallel https requests were
slowed down significantly due to all of the threads created in order
to complete the SSL operations.

Based on @kamalaboulhosn's patch (https://github.com/mono/mono/pull/640/files)
2013-08-06 10:32:54 +02:00
Zoltan Varga ab92538d5a [llvm] Disable LLVM for async methods to work around #13734. 2013-08-06 09:28:57 +02:00
Zoltan Varga 6cca13b657 [llvm] Avoid adding methods which failed llvm compilation to 'mono.function_indexes'. 2013-08-06 09:28:32 +02:00
Zoltan Varga 1188277099 [sdb] Improve logging a bit. 2013-08-06 09:26:46 +02:00
Atsushi Eno 439046726f implement character validation methods in XmlConvert. Fix bug #11910. 2013-08-06 14:38:14 +09:00
Rodrigo Kumpera 70d411b525 Fix thinko in last commit. It's DISABLE_COM and not DISABLE_REMOTING. 2013-08-05 17:25:56 -04:00
Rodrigo Kumpera 1f6effb1e1 [sgen]GC fight club rules. NEVER poke the managed heap if you are not supposed to. 2013-08-05 17:24:57 -04:00
Rodrigo Kumpera 37ac7d16dc [sgen]Add some comments on the usage of all STW related fields. 2013-08-05 17:04:14 -04:00
Rodrigo Kumpera 300f015223 monotouch requires DISABLE_COM too. 2013-08-05 14:24:48 -04:00
Rodrigo Kumpera 809b7ed950 Fix log messge. 2013-08-05 11:41:24 -04:00
Pablo Ruiz Garcia 6128710873 Fixed xamarin bug #13708: routing constraints should be trated as 'convertible to string' in order to be compat with MS.NET 2013-08-05 15:20:31 +02:00
Marek Safar fb24aa7b1a Don't show internal error when default paramater expression cannot be converted to paramter type. Fixes #13682 2013-08-05 12:17:18 +02:00
Marek Safar 8b3b6a5208 Enable more constant tests 2013-08-05 11:32:04 +02:00
Marek Safar f4c24efe89 Add better diagnostics for invalid properties 2013-08-05 11:32:04 +02:00
Marek Safar 0b016adf56 Revert "Add null constant argument type check"
This reverts commit 01697c1f78.
2013-08-05 11:32:03 +02:00
Miguel de Icaza 5ad97cca6c Not currently referenced 2013-08-05 11:32:03 +02:00
Marek Safar 7cda2dd37c Merge pull request #723 from alesliehughes/master
Revert "Add class DnsPermission"
2013-08-05 02:07:57 -07:00
Atsushi Eno 8a10b06610 Fix bug #13485: retrieve private fields and properties in serialization. 2013-08-05 15:36:24 +09:00
Micael Dias 5a9472a254 Fix cross compilation to windows. "Windows.h" should be "windows.h". Fixes #13729. 2013-08-05 08:10:32 +02:00
Zoltan Varga 568e0bc803 Add support for constrained gsharedvt calls to IComparable<T>.CompareTo ()/IEquatable<T>.Equals (). Fixes #13704. 2013-08-04 09:18:49 +02:00
Zoltan Varga e7a9566734 Put runtime-invoke wrappers of valuetype methods into a separate cache, they have a different signature. 2013-08-04 09:17:43 +02:00
Alex Rønne Petersen 23548657e1 Fix the non-MSVC build. 2013-08-02 22:39:15 +02:00
Neale Ferguson 41a154d096 Variable has_ld was renamed 2013-08-02 15:20:47 -04:00
Rodrigo Kumpera cbbd711017 Merge pull request #681 from tritao/dll-api
Added public API visibility macros
2013-08-02 10:55:19 -07:00
Alistair Leslie-Hughes 9a1ddb9f0c Revert "Add class DnsPermission"
This reverts commit c3d818e1ba.

The class is already part of the System assembly.  I mistook the
namespace as the Assembly name.
2013-08-02 19:02:35 +10:00
Alex Rønne Petersen 09219a1459 Merge pull request #722 from JulianHamilton/master
Faster index lookup in RemoveInternal
2013-08-01 22:59:28 -07:00
JulianHamilton d4e750970c Faster index lookup in RemoveInternal 2013-08-02 09:53:17 +09:30
Alex Rønne Petersen 849fb05887 configure: Fix arch selection for s390x. 2013-08-01 23:45:16 +02:00
Miguel de Icaza 6944d48c68 FullAOT fallback: Slightly better random 2013-08-01 09:50:20 -04:00
Zoltan Varga 0721c1fb28 [sdb] Improve some sdb logging messages. 2013-08-01 06:53:52 +02:00
Zoltan Varga d84a165c8e Fix enum->int unbox casts in gsharedvt code. Fixes desk #42463. 2013-08-01 02:17:33 +02:00
Mark Probst 57224013a8 [sgen] Honor --disable-major. 2013-07-31 10:32:00 -07:00
Marek Safar 1e93b054ec Add better diagnostics for invalid properties 2013-07-31 18:00:38 +02:00
Marek Safar 316061e2dc Revert "Add null constant argument type check"
This reverts commit 01697c1f78.
2013-07-31 18:00:38 +02:00
Marek Safar 057fc20fa4 Fix remaining constant issues 2013-07-31 17:58:54 +02:00
Miguel de Icaza 8a019b64fe Not currently referenced 2013-07-31 09:42:13 -04:00
Marek Safar 9cb7a839eb Merge remote-tracking branch 'origin/master' into playscript-mono 2013-07-31 13:49:36 +02:00
Marek Safar 01697c1f78 Add null constant argument type check 2013-07-31 13:48:00 +02:00
Marek Safar 2a62fb90b5 grammar cleanup 2013-07-31 11:22:27 +02:00
Marek Safar 6608f5db66 Merge remote-tracking branch 'origin/master' into playscript-mono 2013-07-31 10:57:18 +02:00
Marek Safar 8ffb6b1981 Workaround limitation of ancient nunit 2013-07-31 10:55:27 +02:00
Zoltan Varga b6da6da507 Fix some cases of --debug=casts, add tests. 2013-07-31 04:36:50 +02:00
Zoltan Varga c4ced34e1c Avoid tail calls which breaks the test in finalizer-exception.cs. 2013-07-31 04:07:39 +02:00
Zoltan Varga b181fa6d91 Fix a warning. 2013-07-31 03:54:17 +02:00
Zoltan Varga 2a4e1e127b Quote path arguments to opt/llc. Fixes #13603. 2013-07-31 00:26:57 +02:00
Miguel de Icaza b6d1b4492f Class libraries: introduce mobile_static profile, for MonoTouch-like static builds, but not limited to iOS (WinStore, Kumpera did the work). 2013-07-30 16:51:38 -04:00
Marek Safar 81e3a33c79 Write only import section from global namespaces before global attribute sections. Fixes #13523 2013-07-30 20:18:48 +02:00
Alex Rønne Petersen ff9f71c44e Fall back to /proc/cpuinfo when sys/auxv.h is not available.
Diagnosed and suggested by Chris Araman <[email protected]>.
2013-07-30 17:56:41 +02:00
Paolo Molaro 4ed1d92610 Merge pull request #703 from ysw/master
Fixed: send/recv race in tpool-epoll and tpool-kqueue implementations
2013-07-30 08:51:04 -07:00
Marek Safar 77d2f31ac1 Merge pull request #665 from andreas-auerswald/master
Serilaization TimeZoneInfo class
2013-07-30 06:56:54 -07:00
Marek Safar adbe98f12d Add more system assemblies remapping. Fixes #11294 2013-07-30 15:51:30 +02:00
Marek Safar 694d67d582 No type forwarders for 2.0 System.Net 2013-07-30 15:51:29 +02:00
Marek Safar d90decc417 Fixed binary serialization 2013-07-30 15:51:29 +02:00
Marek Safar fa8dc3c5e5 Merge pull request #719 from alesliehughes/master
Last of System.DirectoryServices.ActiveDirectory classes
2013-07-30 03:44:51 -07:00
Marek Safar ebff81b3d5 Fix ObservableCollection binary serialization (based on 828a6a4f45) 2013-07-30 11:14:43 +02:00
Alistair Leslie-Hughes df60ae8379 Added the following classes
ActiveDirectorySite
ActiveDirectorySiteCollection
ActiveDirectorySiteLink
ActiveDirectorySubnet
ActiveDirectorySubnetCollection
Domain
DomainCollection
DomainController
DomainControllerCollection
Forest
GlobalCatalog
GlobalCatalogCollection
ReadOnlySiteCollection
ReadOnlySiteLinkCollection

I couldn't split them up into single commits without breaking the build.
2013-07-30 17:58:54 +10:00
Alistair Leslie-Hughes 5c3ea0d668 Add class ActiveDirectorySchema 2013-07-30 17:58:53 +10:00
Alistair Leslie-Hughes 0b839ce9ea Add class ActiveDirectorySchemaClass, ActiveDirectorySchemaClassCollection, ReadOnlyActiveDirectorySchemaClassCollection 2013-07-30 17:58:52 +10:00
Alistair Leslie-Hughes dd53968422 Add class ActiveDirectorySchemaPropertyCollection, ReadOnlyActiveDirectorySchemaPropertyCollection 2013-07-30 17:58:49 +10:00
Alistair Leslie-Hughes 73caba4f68 Add class ActiveDirectorySchemaProperty 2013-07-30 17:58:48 +10:00
Alistair Leslie-Hughes eea85080a6 Add ForestTrustRelationshipInformation 2013-07-30 17:58:47 +10:00
Alistair Leslie-Hughes 77986a10be Add class ForestTrustDomainInfoCollection 2013-07-30 17:58:44 +10:00
Alistair Leslie-Hughes d673f23cad Add class ForestTrustDomainInformation 2013-07-30 17:58:42 +10:00
Alistair Leslie-Hughes e99ecebd51 Add class ApplicationPartitionCollection 2013-07-30 17:58:41 +10:00
Alistair Leslie-Hughes 76e680de20 Add class ApplicationPartition 2013-07-30 17:58:39 +10:00
Alistair Leslie-Hughes 277758cdab Add class ReadOnlyDirectoryServerCollection 2013-07-30 17:58:37 +10:00
Alistair Leslie-Hughes 0b7e53aa89 Add class DirectoryServerCollection 2013-07-30 17:58:35 +10:00
Alistair Leslie-Hughes d1711cf941 Add class DirectoryServer, ReplicationConnection, ReplicationConnectionCollection 2013-07-30 17:58:34 +10:00
Alistair Leslie-Hughes 0c1a0270bc Add class ReplicationNeighborCollection 2013-07-30 17:58:32 +10:00
Alistair Leslie-Hughes 9aa6a601e4 Add class ReplicationOperationInformation 2013-07-30 17:58:30 +10:00
Alistair Leslie-Hughes 15eed77288 Add class ReplicationOperationCollection 2013-07-30 17:58:27 +10:00
Alistair Leslie-Hughes e1107c0b30 Add class ReplicationOperation 2013-07-30 17:58:26 +10:00
Alistair Leslie-Hughes c83b58b942 Add class DirectoryContext 2013-07-30 17:58:23 +10:00
Alistair Leslie-Hughes b5e4d2de43 Add class ReplicationCursorCollection 2013-07-30 17:58:22 +10:00
Alistair Leslie-Hughes c6914fe1b1 Add class ReplicationCursor 2013-07-30 17:58:21 +10:00
Alistair Leslie-Hughes 65b50fc464 Add class ReplicationFailureCollection 2013-07-30 17:58:18 +10:00
Alistair Leslie-Hughes ce3e843793 Add class ReplicationFailure 2013-07-30 17:58:16 +10:00
Alistair Leslie-Hughes 7101724538 Add class TrustRelationshipInformationCollection 2013-07-30 17:58:15 +10:00
Alistair Leslie-Hughes 4d74cc9c57 Add class TrustRelationshipInformation 2013-07-30 17:58:14 +10:00
Alistair Leslie-Hughes 9543cd8c27 Add class TopLevelNameCollection 2013-07-30 17:58:11 +10:00
Alistair Leslie-Hughes 01536c4acf Add class TopLevelName 2013-07-30 17:58:09 +10:00
Alistair Leslie-Hughes 9fdd8bc9b2 Add delegate SyncUpdateCallback 2013-07-30 17:58:06 +10:00
Alistair Leslie-Hughes 727520fbdd Add class SyncFromAllServersOperationException 2013-07-30 17:58:04 +10:00
Alistair Leslie-Hughes c65b7e486f Add class SyncFromAllServersErrorInformation 2013-07-30 17:58:01 +10:00
Alistair Leslie-Hughes 48b37187ef Add class ActiveDirectorySecurity 2013-07-30 17:57:58 +10:00
Alistair Leslie-Hughes 8165563a4c Add class ActiveDirectoryAuditRule 2013-07-30 17:57:57 +10:00
Alistair Leslie-Hughes c676050454 Add ActiveDirectoryAccessRule 2013-07-30 17:57:57 +10:00
Alistair Leslie-Hughes 0da8d969d3 Add enum ActiveDirectoryRights 2013-07-30 17:57:56 +10:00
Alistair Leslie-Hughes 6a9e457af2 Add enum ActiveDirectorySecurityInheritance 2013-07-30 17:57:56 +10:00
Marek Safar d0cfdc22b4 Add test for bug #13509 2013-07-30 09:52:36 +02:00
Zoltan Varga a7debabcd4 Fix a Mono.Posix test to avoid failing if readlinkat() is not available. 2013-07-30 01:28:19 +02:00
Rodrigo Kumpera 000d442b50 Use a relative symlink. 2013-07-29 14:38:27 -04:00
Marek Safar 02820da410 Correctly import nested non-generic types inside generic containers used within same generic container. Fixes #13549 2013-07-29 18:08:00 +02:00
Marek Safar 90e4ae45ea Clone arguments array before modifying. 2013-07-29 16:28:18 +02:00
Marek Safar 12aa2ee3ca Correctly parse pragma headers. Fixes #13501 2013-07-29 14:36:11 +02:00
Zoltan Varga cd49ed4b02 Revert the 'Emit push/pop LMF code as IR' changes, they seem to break make test-sgen on wrench. 2013-07-29 14:27:11 +02:00
Marek Safar 01ee50f7d6 Merge pull request #718 from alesliehughes/master
More System.DirectoryServices.ActiveDirectory classes + other.
2013-07-29 04:25:40 -07:00
Alistair Leslie-Hughes e906cecb4c Add class ActiveDirectorySchedule 2013-07-29 20:57:18 +10:00
Alistair Leslie-Hughes e8f477f90a Add class ActiveDirectoryRoleCollection 2013-07-29 20:56:41 +10:00
Alistair Leslie-Hughes 0a93160fdc Add class ActiveDirectoryReplicationMetadata 2013-07-29 20:56:04 +10:00
Alistair Leslie-Hughes e338775ecd Add class ActiveDirectoryPartition 2013-07-29 20:55:27 +10:00
Alistair Leslie-Hughes 52300170c7 Add class ActiveDirectoryOperationException 2013-07-29 20:54:43 +10:00
Alistair Leslie-Hughes c732e37828 Add enum TopLevelNameStatus 2013-07-29 20:54:08 +10:00
Alistair Leslie-Hughes a157487ca7 Add enum PropertyTypes 2013-07-29 20:54:02 +10:00
Alistair Leslie-Hughes 8b9d426608 Add enum ForestTrustDomainStatus 2013-07-29 20:53:55 +10:00
Alistair Leslie-Hughes 62cd47529d Add enum ActiveDirectorySyntax 2013-07-29 20:53:42 +10:00
Alistair Leslie-Hughes 374c94876a Add enum ActiveDirectorySiteOptions 2013-07-29 20:53:15 +10:00
Alistair Leslie-Hughes c3d818e1ba Add class DnsPermission 2013-07-29 20:53:03 +10:00
Alistair Leslie-Hughes 2864dd1bad Add missed file TrustType.cs 2013-07-29 20:52:13 +10:00
Alistair Leslie-Hughes ea8e3bfa07 Add enum SchemaClassType 2013-07-29 20:51:49 +10:00
Alistair Leslie-Hughes ad32f65e9b Add missed file AttributeMetadataCollection.cs 2013-07-29 20:51:39 +10:00
Alex Rønne Petersen a1e5ba803f Fix a missing return statement in 16d2bcaa37. 2013-07-29 05:09:03 +02:00
Zoltan Varga 77c1ea1999 Fix overflow checking in newarray with 64 bit array lengths. Fixes part of #13544. 2013-07-29 03:08:12 +02:00
Jonathan Pryor eb13855b98 Merge pull request #701 from steffen-kiess/fix-11778
Fix Syscall.readlink() for non-ascii targets
2013-07-28 07:17:38 -07:00
Marek Safar 0a3b65804b Merge pull request #716 from alesliehughes/master
More System.DirectoryServices.ActiveDirectory classes
2013-07-28 04:24:53 -07:00
Alistair Leslie-Hughes 40546e633d Add class AttributeMetadataCollection 2013-07-28 19:22:00 +10:00
Alistair Leslie-Hughes 0d6d70b299 Add class AttributeMetadata 2013-07-28 19:20:55 +10:00
Steffen Kieß 9b824c31c8 Fix Syscall.readlink() for non-ascii targets
Syscall.readlink() currently returns an integer indicating the number of
bytes in the link. As buf contains chars, this value is useless if the
target contains non-ascii characters.

This commit creates a new overload which uses a byte array instead of a
StringBuilder and rewrites the old overload to return the number of chars
instead.

Fixes #11778 and #9611
2013-07-28 11:11:38 +02:00
Alistair Leslie-Hughes 98dec22c8f Add class ReadOnlyStringCollection 2013-07-28 18:39:04 +10:00
Zoltan Varga 7c89014866 [sdb] Fix round tripping of vtypes with boxed fields. Fixes #12354. 2013-07-28 09:40:32 +02:00
Alistair Leslie-Hughes 9036063250 Add enum TrustDirection.cs 2013-07-28 17:09:03 +10:00
Alistair Leslie-Hughes c1f4854661 Add class ReplicationNeighbor 2013-07-28 17:00:23 +10:00
Alistair Leslie-Hughes ff3f2aca0e Add enum LocatorOptions 2013-07-28 16:51:34 +10:00
Alistair Leslie-Hughes 14ac833855 Add enum ForestMode 2013-07-28 16:37:25 +10:00
Alistair Leslie-Hughes 2cde7a3eca Add enum DomainMode.cs 2013-07-28 16:21:13 +10:00
Alistair Leslie-Hughes fa60f1033b Add enum ActiveDirectoryRole 2013-07-28 16:10:17 +10:00
Zoltan Varga 76890ae042 Add error handling to calls of mono_reflection_create_custom_attr_data_args (). Fixes part of #13435. 2013-07-28 02:52:51 +02:00
Zoltan Varga e2478f0c75 Remove #ifdefs from MonoTrampolineType, to prevent cross-compilation problems where the cross compiler and the target runtime have different defines. Also do a sanity check at aot load time. 2013-07-27 23:55:29 +02:00
Zoltan Varga 02964f35a8 Fix an assert in constrained_gsharedvt_call_setup (), mono_class_interface_offset () returns a -1 on failure, not 0. 2013-07-27 23:55:28 +02:00
Marek Safar dbf1626dc0 Don't hide internal error exception when reported cannot show it. 2013-07-27 08:58:11 +02:00
Marek Safar 69d356081a Add clone for error expression. Fixes #13443 2013-07-26 23:44:40 +02:00
Marek Safar b96c455ef9 Less cascading errors 2013-07-26 23:23:50 +02:00
Marek Safar 439ef67c99 Merge pull request #714 from IDisposable/patch-2
Consistent use of ch to avoid array indexing more than once.
2013-07-26 14:15:39 -07:00
Zoltan Varga f7e2304843 Add more extensive logging to sdb. 2013-07-26 23:04:51 +02:00
Marc Brooks a667b8846d Consistent use of ch to avoid array indexing more than once.
Replace the couple places where the string character array was being indexed twice in the same block instead of the character being cached locally. Cleanup formatting of the switch statements to follow conventions.
MIT licence
2013-07-26 14:06:33 -05:00
Alex Rønne Petersen 78db50f208 Revert the use of mono_binary_search () in support/supportw.c.
This code can't depend on mono/utils and doesn't need the 'fixed'
implementation of bsearch () anyway since keys are never null.
2013-07-26 20:16:24 +02:00
Marek Safar 7a307b7068 Remove CultureInfo.CurrentCulture dependency from ordinal based string::EndsWith. Fixes #13509 2013-07-26 19:48:50 +02:00
Marek Safar 567f714b26 Lift result of enum substraction when operation is lifted due to non-nullable enum type. Fixes #13454 2013-07-26 16:30:39 +02:00
Marek Safar 6ff60ff56e Comment update 2013-07-26 16:30:38 +02:00
Alex Rønne Petersen bd54b2b72d Add a mono_binary_search () function.
This is a replacement for bsearch () because some platforms
have bogus asserts in their implementations.
2013-07-26 16:24:50 +02:00
Alex Rønne Petersen 912074c481 Fix a C# compiler error in the runtime test suite. 2013-07-26 16:23:51 +02:00
Alex Rønne Petersen 41d5852ba0 Fix a warning in appdomain.c introduced by 76e8c8ba0f. 2013-07-26 16:23:41 +02:00
Alex Rønne Petersen 79dfbe5192 Mark inline assembly in mono-hwcap-s390x.c volatile. 2013-07-26 14:26:59 +02:00
Alex Rønne Petersen 84c483ae45 Fix up memory barriers on Windows.
1. The _ReadWriteBarrier intrinsic and friends do not actually issue
   a CPU fence; they are purely for inhibiting the compiler in moving
   loads and stores across the call. So when compiling with MSVC, we
   also need to call MemoryBarrier from Windows.h to issue a fence.
   Note that _ReadWriteBarrier is *not* implied by MemoryBarrier; both
   are *really* needed.
2. On Cygwin, we only support GCC 3.x, so resort to inline assembly to
   issue memory barriers. I would have liked to avoid this, but since
   GCC 3.x doesn't provide __sync_synchronize and we aren't likely to
   upgrade to 4.x anytime soon, this is the workaround for now.
2013-07-26 14:26:55 +02:00
Marek Safar 6b55ac5530 Check promoted value type binary equality operations against null too. Fixes #13497 2013-07-26 13:51:23 +02:00
Marek Safar 4085776a67 Ignore space separators in nowarn arguments. Fixes #13476 2013-07-26 10:30:48 +02:00
Marek Safar d199de6270 Use local variable in commit 482f6c7b55 2013-07-26 09:49:56 +02:00
Marek Safar 482f6c7b55 Show more info for missing indirect assembly references 2013-07-26 09:44:53 +02:00
Zoltan Varga a3c12804f0 Update msvc project files with newly added sgen files. 2013-07-26 03:55:58 +02:00
Zoltan Varga a54d96b37e Add full-aot support for runtime invokes to array Get/Set methods. 2013-07-26 02:01:47 +02:00
Zoltan Varga 180fb9b3f9 Avoid an assert on android where seq points are not generated for wrappers. 2013-07-26 00:36:21 +02:00
Jeffrey Stedfast ff41b501ea Revert "Revert "[xbuild]: Provide a real Microsoft.Portable.CSharp.targets""
This reverts commit a4800b96b2.
2013-07-25 16:19:26 -04:00
Jeffrey Stedfast a4800b96b2 Revert "[xbuild]: Provide a real Microsoft.Portable.CSharp.targets"
This reverts commit 03011419a4.
2013-07-25 14:42:34 -04:00
Jonathan Pryor 365da8343a [System] Fix DnsTest.GetHostByName() test.
Test Case Failures:
	1) MonoTests.System.Net.DnsTest.GetHostByName : Should raise a SocketException (assuming that 'www.unlikely.novell.com' does not exist)
	  at MonoTests.System.Net.DnsTest.GetHostByName () [0x00089] in /Users/jon/Development/mono-HEAD/mono/mcs/class/System/Test/System.Net/DnsTest.cs:212
	  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
	  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/jon/Development/mono-HEAD/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

As it happens, 'www.unlikely.novell.com' DOES exist:

	$ ping www.unlikely.novell.com
	PING www.unlikely.novell.com (199.101.28.20): 56 data bytes
	64 bytes from 199.101.28.20: icmp_seq=0 ttl=57 time=29.399 ms

Apparently it's due to the "www." prefix; remove "www." and the site
isn't found, as expected:

	$ ping unlikely.novell.com
	ping: cannot resolve unlikely.novell.com: Unknown host

Update DnsTest.noneExistingSite so that the DnsTest.GetHostByName()
test passes.
2013-07-25 11:38:09 -04:00
Jonathan Pryor f9d78260db [System] Support FTP download where PWD starts with '\'.
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=13343

There are some Industrial Automation Hardware devices which return a
'\'-prefixed path to the FTP PWD command, which would break:

	System.UriFormatException: Invalid URI: The hostname could not be parsed.
	  at System.Uri.Parse (UriKind kind, System.String uriString)
	  at System.Uri.ParseUri (UriKind kind)
	  at System.Uri..ctor (System.String uriString, Boolean dontEscape)
	  at System.Uri..ctor (System.String uriString) [0x0000
	  at System.Net.FtpWebRequest.GetRemoteFolderPath (System.Uri uri)
	  at System.Net.FtpWebRequest.CWDAndSetFileName (System.Uri uri)
	  at System.Net.FtpWebRequest.ProcessMethod ()
	  at System.Net.FtpWebRequest.ProcessRequest ()
	There was an error connecting to the FTP Server.

The problem was this statement:

	Uri initial = new Uri ("ftp://dummy-host" + initial_path);

Since the FTP server was returning "\" to the PWD command,
`initial_path` was "\", and the above was equivalent to:

	Uri initial = new Uri (@"ftp://dummy-host\");

This results in the UriFormatException.

The solution is to not assume that `initial_path` will start with '/',
and instead use UriBuilder.
2013-07-25 11:38:09 -04:00
Marek Safar b69d833414 Add *CachePolicy to mobile profile. Fixes #13466 2013-07-25 17:23:26 +02:00
Marek Safar 0497877695 Fixed string null constant conversion to object constant 2013-07-25 17:23:25 +02:00
Marek Safar a707a3dadb Implements variable constants 2013-07-25 15:19:49 +02:00
Marek Safar 1022c50752 Merge pull request #713 from alesliehughes/master
Add Some System.DirectoryServices.ActiveDirectory enums.
2013-07-25 03:55:53 -07:00
Zoltan Varga 75ffa3d011 Merge pull request #711 from spicypixel/hotfix/appdomain-leak
Fix string leak when loading assemblies.
2013-07-25 03:33:56 -07:00
Zoltan Varga e5942fbc7b Merge pull request #712 from spicypixel/hotfix/trampoline-name-leak
Fix generic trampoline string leak.
2013-07-25 03:31:16 -07:00
Zoltan Varga f0a95b71e3 Make some sdb tests more robust so they work again after the latest line number changes. 2013-07-25 07:31:54 +02:00
Aaron Oneal 37502a86d5 Fix additional string leaks when creating tramp_info.
A recent change modified mono_tramp_info_create to duplicate the name string passed to it, but all of the references that were previously duping the name before calling were not updated at the same time. This resulted in several memory leaks. This fix removes the now extra string duplications.
2013-07-24 16:17:26 -07:00
Aaron Oneal ad639e3e99 Fix additional string leaks when creating tramp_info.
A recent change modified mono_tramp_info_create to duplicate the name string passed to it, but all of the references that were previously duping the name before calling were not updated at the same time. This resulted in several memory leaks. This fix removes the now extra string duplications.
2013-07-24 16:13:04 -07:00
Aaron Oneal c931c463c2 Fix generic trampoline string leak.
Generic trampolines were leaking strings because:
1. The mono_arch_create_generic_trampoline function uses mono_get_generic_trampoline_name which does strdup.
2. That string was passed into mono_tramp_info_create which did strdup again.

The fix is to free the string after passing it to mono_tramp_info_create.
2013-07-24 15:47:46 -07:00
Aaron Oneal 76e8c8ba0f Fix string leak when loading assemblies.
The mono_portability_find_file method allocates a new string but the private_file_needs_copying method was not freeing it which resulted in a leaked string when loading assemblies.
2013-07-24 14:13:47 -07:00
Zoltan Varga 2c6dc87269 Continue single stepping if the same line reached in all cases. Factor out some code code. Fixes #13065. 2013-07-24 22:46:31 +02:00
Aaron Oneal 17d1c098bf Add support for value types to mono_object_to_string
The current mono_object_to_string implementation does not support value types. This patch adds support by unboxing value types prior to calling mono_runtime_invoke.
2013-07-24 11:45:10 -07:00
Marek Safar 487b05c2b6 Implements local variable 2013-07-24 15:27:04 +02:00
Sebastien Pouliot 7f8fa9a8a5 Allow running System.ServiceModel.Web unit tests on the MOBILE profiles (using the same .sources file) 2013-07-24 08:58:44 -04:00
Alistair Leslie-Hughes 883998ce2d Add enum SyncFromAllServersOptions 2013-07-24 20:20:07 +10:00
Alistair Leslie-Hughes 44690a038a Add enum SyncFromAllServersEvent 2013-07-24 20:19:11 +10:00
Alistair Leslie-Hughes e085ba9991 Add enum SyncFromAllServersErrorCategory 2013-07-24 20:17:56 +10:00
Alistair Leslie-Hughes fdc96789c4 Add enum ReplicationSpan 2013-07-24 20:15:50 +10:00
Alistair Leslie-Hughes 8ba2023998 Add enum ReplicationOperationType 2013-07-24 20:14:51 +10:00
Alistair Leslie-Hughes 7f7a747893 Add enum NotificationStatus 2013-07-24 20:14:01 +10:00
Alistair Leslie-Hughes 5d357d8bde Add enum MinuteOfHour 2013-07-24 20:11:20 +10:00
Alistair Leslie-Hughes 20f022d489 Add enum HourOfDay 2013-07-24 20:08:19 +10:00
Alistair Leslie-Hughes da42adba1d Add enum DirectoryContextType 2013-07-24 20:05:56 +10:00
Alistair Leslie-Hughes 96cf763430 Add enum ActiveDirectoryTransportType. 2013-07-24 20:04:20 +10:00
Marek Safar bb8f31f1a8 Merge pull request #709 from alesliehughes/master
Correct TrySetApartmentstate tests
2013-07-23 23:42:19 -07:00
Alistair Leslie-Hughes ccbc9e3a8f Correct TrySetApartmentstate tests
License: This patch is under the MIT/X11 license.
2013-07-24 14:27:56 +10:00
Zoltan Varga c537883799 Unify the different gsharedvt constrained call jit icalls into one. 2013-07-24 04:13:49 +02:00
Zoltan Varga bc2ace8f20 Avoid calling valuetype methods with a signature which uses an explicit this argument, the JIT passes the implicit argument differently than an explicit one, leading to problems when the method returns another valuetype. 2013-07-24 00:07:29 +02:00
Zoltan Varga d62166b91a Revert "Generate the push/pop LMF code as IR on x86."
This reverts commit 5c85e41f84.

Revert this as it breaks a lot of tests.
2013-07-23 18:08:16 +02:00
Alex Rønne Petersen 0ffa570a3a Merge pull request #697 from linquize/atom-bug
Atom bug
2013-07-23 07:10:49 -07:00
Alex Rønne Petersen 2ee134a8ea Fix the mono-hwcap module to work in the MONO_CROSS_COMPILE case.
The Mini back ends still use the hwcap variables in this case, so we
can't exclude the files they are defined in. Instead, ifdef out the
actual hwcap logic in the MONO_CROSS_COMPILE case.
2013-07-23 15:58:46 +02:00
Sebastien Pouliot 160c8d3015 Do not include tests for AssociatedMetadataTypeTypeDescriptionProvider in MOBILE since the type is not available 2013-07-23 09:03:45 -04:00
Marek Safar 94e78fd162 Fix default content buffer max size 2013-07-23 14:28:45 +02:00
Zoltan Varga a31c107f59 Avoid linking the LLVM runtime codegen libs into a cross-compiler runtime. 2013-07-23 05:30:51 +02:00
Linquize ee48fc81a9 Atom10FeedFormatter should generate subtitle tag for Description property 2013-07-23 08:12:35 +08:00
Marek Safar 53b3d6532a Merge some nrefactory changes 2013-07-22 16:05:06 +02:00
Marek Safar b269b884fa Don't crash when metadata contains private top level type. 2013-07-22 13:44:11 +02:00
Marek Safar 03c3fbe77a Adds async handling to binary:emitbranchable. Fixes #13362 2013-07-22 08:22:41 +02:00
Marek Safar 6a2d71f889 Fixes duplicate error message 2013-07-22 08:22:41 +02:00
Marek Safar 9114f339f9 Add field target for automatic properties 2013-07-22 08:22:40 +02:00
Zoltan Varga 5c85e41f84 Generate the push/pop LMF code as IR on x86. 2013-07-22 03:49:25 +02:00
Zoltan Varga ba79efb593 Fix a problem in emit_pop_lmf (), it no longer needs to change the current bblock. 2013-07-22 03:45:06 +02:00
Zoltan Varga fbdc2a7639 Get rid of the MONO_ARCH_ENABLE_LMF_IR define added by 0938c69a52, use flags in MonoCompile instead. 2013-07-22 03:06:35 +02:00
Rodrigo Kumpera 23ac11d001 Handle property with default values. Fix part of #13336. 2013-07-21 18:22:57 -04:00
Rodrigo Kumpera 89d5527369 Merge pull request #600 from tr8dr/master
Fix for bug 9250 (critical bug for embedded mono)
2013-07-21 12:21:29 -07:00
Cameron Taggart 4579fb3d43 fixes ctaggart/mono#2 cpuid() now compiles in VS 2012 2013-07-21 20:20:50 +02:00
Alex Rønne Petersen 8a9d70fabc Fix a "mixed decls and code" warning. 2013-07-21 19:56:06 +02:00
i59 2719711a51 Added mono-mutex.h & c to libmonoutils.vcxproj
Signed-off-by: Alex Rønne Petersen <[email protected]>
2013-07-21 12:46:00 +02:00
i59 5385752588 mono-mutex.c: Don't include sys/time.h on Windows;
Signed-off-by: Alex Rønne Petersen <[email protected]>
2013-07-21 12:45:33 +02:00
Alex Rønne Petersen 33ffb757d2 Merge pull request #707 from LHCGreg/12752-windows_nul_isredirected
Improve detecting if a handle is a console on Windows.
2013-07-20 23:06:41 -07:00
Alex Rønne Petersen 16d2bcaa37 libgc: Use GCC atomics on ARM.
This is to ensure that if the runtime is compiled for e.g.
ARM v4 or v5, it will use the correct atomics on v6 and v7.
2013-07-21 08:00:58 +02:00
Zoltan Varga 9691284796 Rework the x86 lmf code to use stores instead of pushes, and to be more consistent with the code on other platforms. 2013-07-20 17:32:11 +02:00
Zoltan Varga 0938c69a52 Generate the push/pop LMF code as IR on architectures which support it. Currently only used on amd64. 2013-07-20 16:05:48 +02:00
Marek Safar 5e1c9a8ffe Fix indexer member formating 2013-07-20 11:15:06 +02:00
Marek Safar b166ec8b48 Fixes failing tests 2013-07-20 09:18:58 +02:00
Marek Safar 354027fe22 Schedule internal delay task on default scheduler only. Fixes #13318 2013-07-20 09:18:58 +02:00
Marek Safar 929bdf2f1d Lazy initialization of type parameters expanded interfaces. Fixes #13324 2013-07-20 09:18:57 +02:00
Zoltan Varga f8bf28804c Another attempt at fixing mono_atomic_load_acquire() on MSVC. Fixes #13340. 2013-07-20 06:05:49 +02:00
Alex Rønne Petersen 4e54e9e05f Enable GCC atomics on mips. 2013-07-20 03:03:55 +02:00
Alex Rønne Petersen 920d873ff3 Enable GCC atomics on arm. 2013-07-20 03:03:55 +02:00
Alex Rønne Petersen 93acdb1fcc Enable GCC atomics on ppc and ppc64. 2013-07-20 03:03:55 +02:00
Alex Rønne Petersen 579148e2d6 Enable GCC atomics on x86 and amd64. 2013-07-20 03:03:55 +02:00
Alex Rønne Petersen 778fc600e0 Use GCC atomics when USE_GCC_ATOMIC_OPS is defined.
We still prefer Windows.h functions when compiling for Windows, and
MSVC intrinsics for memory barriers when compiling with MSVC.
2013-07-20 03:03:55 +02:00
Alex Rønne Petersen ca747a3a1c PowerPC build fix in mono-hwcap-ppc. 2013-07-20 03:03:55 +02:00
Alex Rønne Petersen 80b8412a11 configure: Remove obsolete FIXME comment. 2013-07-20 03:03:54 +02:00
Alex Rønne Petersen 27c3736aac Add a MONO_VERBOSE_HWCAP environment variable.
This causes detected hardware features to be printed to stdout.
2013-07-20 03:03:54 +02:00
Alex Rønne Petersen a256df77aa Remove now-unneeded mono_aot_only guard around mono_hwcap_init ().
We no longer use the code manager in any of the hwcap implementations,
so we don't need to disable the hwcap infrastructure in full-aot mode.
2013-07-20 03:03:54 +02:00
Alex Rønne Petersen 24c84e6f31 Remove the JIT-ed CPUID hack from mono-hwcap-x86.
A proper workaround for the 32-bit PIC issue exists: Using xchg to
unclobber EBX which is used by the compiler. This means we can just
use inline assembly to issue the instruction, eliminating the hack
where we JIT-compiled a function to do the CPUID.

This patch also makes it so that we use MSVC's __cpuid intrinsic
on both 32-bit and 64-bit x86 since it's available on both.
2013-07-20 03:03:54 +02:00
Alex Rønne Petersen 08d4170b8c Check for sys/auxv.h and only use it if available. 2013-07-20 03:03:54 +02:00
Alex Rønne Petersen bfefbf3460 Make all Mini back ends use mono-hwcap for CPU feature detection.
Also some related cleanup as a result of this.
2013-07-20 03:03:54 +02:00
Zoltan Varga 5e9f57b92f Remove the async hacks from the gsharedvt code, gsharedvt can now handle async methods, and the infrastructure methods they use. 2013-07-19 20:53:16 +02:00
Zoltan Varga cfb36e518a Share byref arguments in runtime invoke signatures with int&. Remove the restrictions on sharing runtime invoke wrappers of valuetype instance methods, its not longer needed. 2013-07-19 20:52:12 +02:00
Zoltan Varga 50faec743e Properly null terminate strings in mono_dwarf_escape_path (). Fixes #13050. 2013-07-19 17:55:24 +02:00
Marek Safar ad0c77db0f Initial with statement implementation 2013-07-19 17:34:30 +02:00
Sebastien Pouliot 0b09bfc495 Disable TestDisposeOnCallback for MONOTOUCH, the test does not really work as the state is null (and throws in a separate thread) 2013-07-19 09:38:58 -04:00
Zoltan Varga 0de54a335a Avoid calling mono_domain_free () in a cross-compiler, it causes a GC, and the unwind infrastructure is not properly set up when cross-compiling. 2013-07-18 19:52:31 +02:00
Mark Probst be1042379a Simplify emit_write_barrier().
We have two ways of passing in the value - by MonoInst* and by register.
Remove the second and always pass a MonoInst*.
2013-07-18 10:38:24 -07:00
Marek Safar 951f9a7912 Make package functions work same as other package level members 2013-07-18 16:18:07 +02:00
Marek Safar 9b63f759fb Merge branch 'master' into playscript-mono 2013-07-18 15:40:53 +02:00
Marek Safar 2e255604b2 Add package level functions restrictions 2013-07-18 15:40:18 +02:00
Marek Safar bb6cd4b722 Add nested partial types inside nested partial types to AST. Fixes #13316 2013-07-18 14:42:12 +02:00
Marek Safar 37bad99b16 Nested partial type inside generic class can have base type defined later than current type inflation happens. Fixes #13289 2013-07-18 10:55:38 +02:00
Marek Safar b92bac52bf Don't try to match lifted equality operators on same reference types 2013-07-18 10:55:37 +02:00
Zoltan Varga ff23e80e3e Fix an overflow if MONO_ZERO_LEN_ARRAY is not 0. Fixes #13233. 2013-07-18 05:36:58 +02:00
Alex Rønne Petersen e19fa7926a Add a mono_hwcap_init () call to parse_optimizations ().
This is necessary because we need hardware features to be
detected by the time we call mono_arch_cpu_optimizations ().
2013-07-18 04:17:22 +02:00
Alex Rønne Petersen a3272f7b44 Make mono_hwcap_init () only perform initialization if not already done.
This moves arch-specific initialization to mono_hwcap_arch_init ().
2013-07-18 04:17:22 +02:00
Mark Probst bfd1c73b7d Weaken a race condition in object initialization.
It's still there in a different form, but it's not easy to fix.
2013-07-17 16:26:56 -07:00
Mark Probst 6cd895de20 [sgen] Binary protocol improvements.
Protocol domain unloads, and allow greping for vtable.
2013-07-17 16:26:56 -07:00
Zoltan Varga 645991d363 Add support for constrained calls with one ref parameter to gsharedvt, enought to support AsyncMethodBuilder methods. 2013-07-17 23:54:16 +02:00
Zoltan Varga d1df1729ba Fix a warning. 2013-07-17 23:10:41 +02:00
Zoltan Varga 32be89f0f2 Add support for a simple form of constrained calls to gsharedvt, enough to support AsyncMethodBuilder.Start (). 2013-07-17 23:07:42 +02:00
Zoltan Varga d64dc48f1f Fix a warning. 2013-07-17 23:07:41 +02:00
Rodrigo Kumpera beb9cee5b5 Merge pull request #706 from elijahtaylor/fixdyncode
Fix nacl_dyncode include
2013-07-17 11:09:18 -07:00
Marek Safar 442ccb9676 Merge pull request #705 from alesliehughes/master
Allow TrySetApartmentState to set the same state multiple times.
2013-07-16 23:18:55 -07:00
Alistair Leslie-Hughes 070c3abecf Allow TrySetApartmentState to set the same state multiple times.
License: This patch is under the MIT/X11 license.
2013-07-17 15:22:54 +10:00
Alex Rønne Petersen 8f9a0185b3 mono-hwcap: Add ARM version detection for iOS. 2013-07-17 04:59:23 +02:00
Zoltan Varga 9999ea4a68 Avoid printing an extra newline when printing fp results while tracing. 2013-07-16 23:45:42 +02:00
Mark Probst aef4b77ea7 Fix race conditions in finalizer/weak link staging. 2013-07-16 14:41:40 -07:00
Elijah Taylor 614f3f9049 Fix nacl_dyncode include 2013-07-16 14:14:31 -07:00
Zoltan Varga fc1145ae84 Fix MONO_GC_DEBUG=collect-before-allocs. mono_gc_alloc_obj_nolock () was not called for the majority of allocations. 2013-07-16 18:54:14 +02:00
Zoltan Varga e90505c29f Fix the dependencies of the corlib test suite so the test suite is not rebuilt every time. 2013-07-16 16:17:01 +02:00
Zoltan Varga 1eff479c71 Fix a crash in thread_suspend_func () if the thread has no tls set. 2013-07-16 16:17:01 +02:00
Marek Safar 2226f02696 Implements new expresssion statement 2013-07-16 13:43:24 +02:00
Marek Safar b65deac489 Remove redundant status capturing 2013-07-16 10:13:27 +02:00
Marek Safar 20aaf27c90 Fixes scheduling of non-inlined sychronous continuations. 2013-07-16 10:00:15 +02:00
Zoltan Varga 453654552e Avoid an assert in mono_save_seq_point_info () if no seq points are generated for a method, as in wrappers in android. Hopefully fixes #12995. 2013-07-15 22:15:06 +02:00
Zoltan Varga b652b273af Make wrappers whose signature is static static. 2013-07-15 20:54:09 +02:00
Zoltan Varga 61923824ce Fix synchronized_generic_cache. 2013-07-15 20:34:39 +02:00
Sebastien Pouliot 1c7fc8195f Escape the .file path name generated in the asembly code. clang does not mind, but gcc does 2013-07-15 20:24:05 +02:00
Zoltan Varga 9d719ab6d0 Put the unbox_trampolines table into the .text segment instead of .rodata on mt since it contains code. 2013-07-15 20:09:53 +02:00
Rodrigo Kumpera b7bed40197 [runtime] Add a fallback on the TLS probing code that does a range scan in the pthread structure. 2013-07-15 12:36:16 -04:00
Rodrigo Kumpera 56e1d8fca6 Bump master version to 3.3.0. 2013-07-15 12:36:13 -04:00
Alex Rønne Petersen 846d80f19e Avoid using dmb/dsb/dib instructions on ARM v6.
This only worked by accident before the HAVE_ARMV<N>
changes because __ARM_ARCH_6__ is never defined by
any compiler.
2013-07-15 16:48:59 +02:00
Zoltan Varga 8f99af4eec Remove test-sgen from make check in tests/, it takes too much time. 2013-07-15 16:36:53 +02:00
Zoltan Varga b511f6d141 Fix gshared synchronized wrappers for static methods. 2013-07-15 16:36:25 +02:00
Marek Safar 9694eb7dbd Implement webrequest cancellation. Fixes #13200 2013-07-15 14:12:25 +02:00
Yuriy Solodkyyy 946e182bd9 There was a long discussion on a mailing list about the async-socket problem
in mono. We have previously submitted a patch fixing the problem, however it
was later reverted back as causing deadlocks in some cases.

This patch is very close to the original one, but it takes into account how
tpool-thread operates and avoids deadlocks in this code. (Unfortunately, it
probably makes the code a little less readable, but it works).

So, this patch aims to fix several races in the mono code. These problems are
not relevant for a lot of applications as they can appear only if both read
and write operations are active on the socket. (I.e. RPC style communications
do not trigger the problem).

So, there are two major problems with existing mono code:

a) threadpool.c :: socket_io_add

LeaveCriticalSection (&data->io_lock);
data->modify (data->event_data, fd, state->operation, ievt, is_new);

the problem is that data modify receives ievt and is_new arguments which
may be already outdated due to the concurrent operation on the same socket
(read vs. write).

(If you look at the other part of the operation in
tpool_epoll.c :: tp_epoll_wait updates the epoll settigs under the lock.)

b) The epoll implementation uses the following code to change the epoll
settings in the data->modify handler.

if (epoll_ctl (data->epollfd, epoll_op, fd, &evt) == -1) {
  int err = errno;
  if (epoll_op == EPOLL_CTL_ADD && err == EEXIST) {
    epoll_op = EPOLL_CTL_MOD;
    if (epoll_ctl (data->epollfd, epoll_op, fd, &evt) == -1) {
      g_message ("epoll_ctl(MOD): %d %s", err, g_strerror (err));
    }
  }
}

Here we have the same problem. If concurrent operation updates epoll between
first epoll_ctl and the second epoll_ctl the second will override concurrent
update.

These problems result in missing callbacks on async socket send or receive
completion

The original idea was as simple as just move the data->modify under the lock.
(NOTE: both internal associated list and epoll are updated under the lock in
case of data->wait (see tp_epoll_wait).

As i already noted it causes a problem for tpool_poll.c implementation as it
uses different approach than epoll/kqueue.

This patch still invokes data->modify under the lock, but allow implementation
to release lock at the point where it is appropriate for the given
implementation.

The tpool-poll.c releases lock immediately and thus its behavior remains
unchanged (and it still has a problem of missing send/receive callbacks)

The tpool-epoll/kqueue implementations update their internal structures and
corresponding OS level structures under the locks (as _wait does). This change
makes them reliable in simultaneous socket read/write scenarios.

The following code demonstrates the problem. See readme inside.

https://github.com/ysw/mono-socket-problem/tree/master/SocketTest

NOTE: you need at least 4 coresto reliably reproduce the problem.

It is quite hard to reproduce on OSX, but it is easy reproducible in LINUX.

This commit is licensed under MIT/X11.
2013-07-15 00:16:23 +03:00
Alex Rønne Petersen bf6a13bcb4 Merge pull request #700 from jack-pappas/patch-1
Call 'awk' instead of 'gawk' for cross-platform compatibility.
2013-07-14 13:56:16 -07:00
Atsushi Eno 132a16ca07 Revert "Merge pull request #622 from killabytenow/master"
This reverts commit 392bae3c45, reversing
changes made to 61cd9ee8b6.
2013-07-13 23:56:59 +09:00
Jack Pappas 5e497f0de4 Call 'awk' instead of 'gawk' for cross-platform compatibility.
Call `awk` instead of `gawk` for cross-platform compatibility. Linux systems normally have a symbolic link from `awk` to `gawk`, so there should be no difference in the functionality on those systems.
2013-07-13 07:56:24 -04:00
Alex Rønne Petersen fab9077c17 configure: Also consider __ARM_ARCH_7S__ when checking for ARM v7.
This is defined by Apple's iOS gcc with -arch armv7s.
2013-07-12 20:39:02 +02:00
Jeffrey Stedfast fb2546951c Prevent potential integer overflows in SortedList's binary search midpoint calculation 2013-07-12 14:05:55 -04:00
Marek Safar 238785a3e3 Don't eat exception from timer handler (this is system timer not SWF timer) 2013-07-12 17:44:53 +02:00
Marek Safar 479cfc6980 Prefer user operators over predefined operators for binary enum operations too. Fixes #13202 2013-07-12 16:23:01 +02:00
Marek Safar 035214bee1 Allow async for explicitly implemented interface methods. Fixes #13197 2013-07-12 15:13:42 +02:00
Marek Safar 0ea5ed961e Implement local functions 2013-07-12 13:50:54 +02:00
Marek Safar abbf953e28 Update some declarations 2013-07-12 13:47:17 +02:00
Martin Baulig 5b8a026a06 .spec file, again. 2013-07-12 10:43:53 +02:00
Atsushi Eno 392bae3c45 Merge pull request #622 from killabytenow/master
UTF8 encoding/decoding improvements
2013-07-11 22:17:05 -07:00
Alex Rønne Petersen 61cd9ee8b6 Replace more __ARM_ARCH_... checks with HAVE_ARMV<N>. 2013-07-12 00:03:02 +02:00
Gerardo García Peña 2e6266606a Reverted changes of commit 6ad7f75a37 2013-07-11 23:52:35 +02:00
Gerardo García Peña 22892bc401 Better and more homogeneous error handling. 2013-07-11 23:49:47 +02:00
Alex Rønne Petersen f99f84a429 Add ARM version detection to configure and use the resulting macros.
This defines ARM_VERSION_{5,6,7}. Several of these can be
defined at once. For example ARM_VERSION_5 and ARM_VERSION_6
will both be defined if the target is an ARM v6 CPU.

Previously, we defined HAVE_ARMV6 based on running a program.
This obviously didn't work for cross-compilation. This new
approach does, and detects more cases (v5, v6, v7) than the
previous check (v6).
2013-07-11 22:11:29 +02:00
Alex Rønne Petersen 718ceb8601 Add a mono-hwcap module to utils.
This is an attempt to unify all the ad-hoc CPU feature
detection we do all over the codebase (mostly in Mini
back ends). It will also be used to detect and use SMP
instructions on older ARM devices (we need this info in
utils/, not just in mini/).

Each architecture has a mono-hwcap-$TARGET.h header if
it has specified one. So for example, if you want to
find out if a VFP unit is available on ARM, you would
include mono-hwcap-arm.h and read mono_hwcap_arm_has_vfp.
Remember to guard inclusions of these files with a check
along the lines of:

    #ifdef TARGET_ARM
    #include "mono/utils/mono-hwcap-arm.h"
    /* ... */
    #endif

Architectures that don't specify a file simply get an
empty implementation with no feature variables. This
empty implementation is also used if Mono itself is
compiled as a cross compiler.

Initialization of the mono-hwcap module is done in the
mini_init () function in mini/mini.c, very early in the
startup process. So in general, calling it is not needed.
2013-07-11 20:12:01 +02:00
Alex Rønne Petersen de60d57559 Fix the tests makefile. 2013-07-11 19:56:06 +02:00
Gerardo García Peña 54f3f6ae21 If 'flush' flag is enabled when calling decoding/encoding function, flush buffer when input run out (satisfies test 'SufficientByteArray'). 2013-07-11 18:54:11 +02:00
Alex Rønne Petersen 5de235b376 Fix (hopefully) the last architecture casing inconsistency. 2013-07-11 18:43:22 +02:00
Alex Rønne Petersen 233e828938 Remove an m68k check from configure. 2013-07-11 18:43:21 +02:00
Alex Rønne Petersen 4ce97be553 Fix an s390x check broken by faff4654c8. 2013-07-11 18:43:21 +02:00
Alex Rønne Petersen fa69e58cc6 Add missing TARGET_* defines for SPARC and Itanium. 2013-07-11 18:43:20 +02:00
Marek Safar 4d4e3c3d5b Add untyped/virtual methods handling 2013-07-11 14:18:10 +02:00
Marek Safar 26a0904c82 Small grammar cleanup 2013-07-10 18:41:04 +02:00
Martin Baulig cee5749a81 Oops, remove extra %endif in .spec file. 2013-07-10 18:09:14 +02:00
Martin Baulig 1f337115cd [PCL]: Add System.Linq.Expressions type-forwarders. 2013-07-10 17:00:14 +02:00
Marek Safar 3dfaaa542d Implement for..each 2013-07-10 16:56:13 +02:00
Martin Baulig 83ed15e19d Add libmonoboehm package to the spec file. 2013-07-10 16:46:53 +02:00
Marek Safar 005dbf7840 Merge branch 'master' into playscript-mono 2013-07-10 16:27:22 +02:00
Marek Safar 24f08876a8 Ignore only local Makefile 2013-07-10 16:26:26 +02:00
Marek Safar 80d3d461c3 Implement for/for..in 2013-07-10 15:38:44 +02:00
Gerardo García Peña 9d55be425d An #if has been negated (bugfix) 2013-07-10 11:26:26 +02:00
Alex Rønne Petersen 9645cd9249 Add atomic.c/.h to libmonoutils.vcxproj. 2013-07-10 06:56:52 +02:00
Alex Rønne Petersen faff4654c8 configure: Set TARGET=S390X instead of S390x for consistency. 2013-07-10 06:56:51 +02:00
Alex Rønne Petersen 938d3fa4cb Merge pull request #695 from jack-pappas/patch-4
Fix preprocessor/compiler warning due to unbalanced apostophe (') character
2013-07-09 21:27:40 -07:00
Jack Pappas 208d5648fe Fix preprocessor/compiler warning due to unbalanced apostophe (') character
Reworded the warning message to be displayed when the fall-through case is taken by the preprocessor in `mono_thread_get_stack_bounds()`.
2013-07-09 21:44:19 -04:00
Sebastien Pouliot de00f9d473 Ensure the new FileStream unit tests does not throw in the non-main thread (which nunit-console won't report but other tools, like Touch.Unit, will) 2013-07-09 20:17:37 -04:00
Rodrigo Kumpera 29cb82c254 Use a non rooted symlink and make it point to the right mono. 2013-07-09 18:28:58 -04:00
Rodrigo Kumpera 2e6f26e1a8 [runtime]Revert the fast tls check as we always need it on mach. Add another iOS 7 offset. 2013-07-09 18:22:01 -04:00
Martin Baulig 5fd4d99fe8 Bump libmonosgen version in the .spec file. 2013-07-10 00:05:28 +02:00
Martin Baulig 66fb7ce67e [build]: Use a relative symlink from mono to mono-sgen. 2013-07-09 22:48:19 +02:00
Rodrigo Kumpera 2172220087 Merge pull request #694 from madewokherd/pthreadinclude
Don't include pthread.h when it's not needed.
2013-07-09 13:19:54 -07:00
Alex Rønne Petersen 35aec39910 Fix a #define style issue in mini.c.
Introduced in d401698972.
2013-07-09 22:17:12 +02:00
Alex Rønne Petersen 251c170d3f Only require mono_arch_is_soft_float () to be defined when needed.
Now, only ports that define MONO_ARCH_SOFT_FLOAT_FALLBACK have to
provide this function. For ports that don't define this, a default
function is provided that returns FALSE.
2013-07-09 22:17:12 +02:00
Alex Rønne Petersen f0ae724eaf Add an MSVC branch to MONO_ALWAYS_INLINE. 2013-07-09 22:17:12 +02:00
Rodrigo Kumpera 1a552aefd4 [runtime] On mach-arm don't probe for tls offsets if the runtime was not built with support for fast tls. 2013-07-09 15:49:51 -04:00
Alex Rønne Petersen d401698972 Change the way we do soft float to a fallback mechanism.
MONO_ARCH_SOFT_FLOAT previously meant that a back end was using
soft float unconditionally. It's now MONO_ARCH_SOFT_FLOAT_FALLBACK
and actually indicates whether the back end has a soft float
fallback compiled in - not necessarily that it's used.

A new port function has been added:

    gboolean mono_arch_is_soft_float (void) MONO_INTERNAL;

This function is what actually tells Mini whether the back end is
going to use soft float. If MONO_ARCH_SOFT_FLOAT_FALLBACK is not
defined, it must return FALSE. Otherwise, it should return TRUE or
FALSE depending on whether the back end determines that the hardware
supports floating point. Once mono_arch_init () has been called,
the value returned from this function must be constant for the rest
of the VM's lifetime.

For example, on ARM, we now try to detect VFP via /proc/self/auxv
or /proc/cpuinfo and, if found, return FALSE from the function. This
only applies to Linux and Android as iOS always has VFP.

It's important to note that if the runtime is built with the 'softfp'
or 'hard' ABIs, the soft float fallback is not compiled in, as the
runtime is assumed to only be executed on VFP-capable systems.

Finally, the ARM feature detection code has been moved from the
mono_arch_cpu_optimizations () function to mono_arch_init () so that
FPU detection/initialization is done in one place.
2013-07-09 19:27:57 +02:00
Rodrigo Kumpera 4bed597229 [build] Add dep tracking between Makefile.am.in and Makefile.am when the extension module is disabled. 2013-07-09 13:22:01 -04:00
Rodrigo Kumpera 66ce1e4960 [runtime]On install, symlink mono to the right binary. 2013-07-09 13:22:00 -04:00
Martin Baulig 77dc2ebb66 Fix the spec file; we don't create any .mdb's for the PCL Facades anymore. 2013-07-09 18:37:34 +02:00
Vincent Povirk 6f54e4a2fc Don't include pthread.h when it's not needed.
Fixes mingw-w64 build.

This commit is licensed under MIT/X11.
2013-07-09 11:30:06 -05:00
Alex Rønne Petersen ec3513c3fd Merge pull request #692 from jack-pappas/patch-2
Use the NI_MAXHOST constant to initialize the size of the hostname buffer.
2013-07-09 08:49:58 -07:00
Alex Rønne Petersen 0e67acba31 MIPS: Set USE_MUL to 0 by default (for now).
Setting it to 1 breaks on Loongson CPUs which are the most common
desktop MIPS CPUs supported by e.g. Debian.

This change can be reverted when more investigation is done to find
out why exactly this breaks.

Thanks to Jo Shields (@directhex) for lots of testing and debugging
and spotting this define that turned out to be the culprit.
2013-07-09 16:48:15 +02:00
Gerardo García Peña 04ffec1684 Added new test for checking EncoderFallbackException exception behaviour. 2013-07-09 16:22:37 +02:00
Marek Safar c7e874a982 Merge pull request #693 from jack-pappas/patch-3
Print diagnostic messages for platform detection
2013-07-09 05:42:18 -07:00
Jack Pappas 24ac85a90f Print diagnostic messages for platform detection
Print some diagnostic messages when running 'make' on this file, so it's clear when a platform has not been explicitly specified and we're going to compile with a platform value which has been automatically selected.
2013-07-09 08:35:26 -04:00
Jack Pappas cf1f9138eb Use the NI_MAXHOST constant to initialize the size of the hostname buffer.
The NI_MAXHOST constant should be used when creating the hostname buffer to avoid potential buffer overflows.
2013-07-09 08:12:41 -04:00
Marek Safar 871a24a580 Update test name 2013-07-09 11:14:56 +02:00
Marek Safar 4ce0e7e848 Equality structural comparer needs to do recursive comparisons. Fixes #13110 2013-07-09 11:12:33 +02:00
Marek Safar d7fe5b8a89 Update failing test 2013-07-09 10:47:29 +02:00
Marek Safar 2ab53f953f Update member access completion after e40775d0dc 2013-07-09 10:44:15 +02:00
Rodrigo Kumpera 5dd394c77c [runtime] Don't return success on invalid parameters, raise an exception instead. 2013-07-08 19:47:45 -04:00
Zoltan Varga fb9400fd06 Place the method_addresses symbol into the .text segment on mt, not rodata, since it is actually code. 2013-07-09 00:26:49 +02:00
Rodrigo Kumpera 7ff2a90ad5 Bump mono to 3.1.1 2013-07-08 18:15:01 -04:00
Gerardo García Peña ef205e5df2 Added new test for checking DecoderFallbackException exception behaviour. 2013-07-08 23:31:06 +02:00
Marek Safar 0ec1a19ac7 Update after newline update 2013-07-08 23:11:50 +02:00
Marek Safar 7554e7cd95 Merge from brooken branch 2013-07-08 22:59:13 +02:00
Zoltan Varga fc7ceab083 Remove the constraint checks from get_shared_inst (), it is no longer needed since we replace gsharedvt arguments with a vtype now. Fixes #12727. 2013-07-08 22:30:16 +02:00
Zoltan Varga a872ebb614 Make the synchronized wrappers static if the original method was static. Fixes shared-generic-synchronized.2.exe. 2013-07-08 18:24:51 +02:00
Marek Safar 71739e6420 Updated gitignore 2013-07-08 18:13:21 +02:00
Zoltan Varga 9e8e9a6d36 Add a test for #12110. 2013-07-08 17:13:52 +02:00
Marek Safar 75f4e90d4b Revert "Revert "Revert "Merge"""
This reverts commit 5705602f1b.
2013-07-08 17:01:47 +02:00
Marek Safar 5705602f1b Revert "Revert "Merge""
This reverts commit ed1838b4e7.
2013-07-08 17:00:36 +02:00
Marek Safar ed1838b4e7 Revert "Merge"
This reverts commit cbe746f29f.
2013-07-08 16:58:33 +02:00
Marek Safar cbe746f29f Merge 2013-07-08 16:49:13 +02:00
Andreas Auerswald a4edd897b5 Add TimeZoneInfo Serialization
Add serialization for the TimeZoneInfo, TimeZoneInfo.AdjustmentRule and TimeZoneInfo.TransitionTime class. It is compatible with the serialization in .Net for cross serialization/deserialization from Mono to .Net and vice versa.

The code in this commit is released under the terms of the MIT/X11 license.
2013-07-08 10:39:51 +02:00
Marek Safar d51dc95fb9 Add test 2013-07-08 09:17:18 +02:00
Marek Safar 6c54381300 Merge pull request #686 from LHCGreg/12971-IsRedirectedAfterSet
Fix behavior of Console.Is*Redirected.
2013-07-07 23:58:15 -07:00
Zoltan Varga f3cc3bf544 Remove some gcc-ism from mono_atomic_load_acquire/release, so it can be compiled by msvc. 2013-07-07 03:47:36 +02:00
Marek Safar 924c7c5514 Merge pull request #690 from akoeplinger/httpruntime-net45
Added handling of 'targetFramework' attribute to HttpRuntime
2013-07-06 08:44:45 -07:00
Alexander Köplinger 9ccd495f33 Added handling of 'targetFramework' attribute (new in .NET 4.5) to HttpRuntime and HttpRuntimeSection 2013-07-06 16:53:22 +02:00
Marek Safar 5c4b348e80 Fixes build 2013-07-06 12:13:18 +02:00
Marek Safar a5ba6ad54d Merge pull request #687 from miniBill/master
Add IISVersion property to HttpRuntime
2013-07-06 00:16:29 -07:00
Leonardo Taglialegne b9cbade24a Add IISVersion property to HttpRuntime 2013-07-06 09:02:20 +02:00
Greg Najda 94660dd77f Improve detecting if a handle is a console on Windows.
Use GetConsoleMode. If it succeeds (returns non-zero) then the handle is a
console. If it fails (returns zero) then the handle is not a console.

The old check, (GetFileType (handle) == FILE_TYPE_CHAR) assumes that a handle
of type FILE_TYPE_CHAR is a console. This falsely reports a handle directed to
NUL as a console.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=12752
2013-07-06 01:10:13 -04:00
Marek Safar be2e73c7e8 Correctly reset buffer for nested asynchronous file stream writes. Fixes #12777 2013-07-05 18:47:22 +02:00
Marek Safar 2d868f3690 Emit additional sequence points for call entry when needed. Fixes #10782 and similars 2013-07-05 14:15:01 +02:00
Marek Safar e40775d0dc Check expression type of resolved expressions too 2013-07-05 14:15:00 +02:00
Greg Najda b5e9e3a965 Fix behavior of Console.Is*Redirected.
Setting Console.Out to a custom stream should not affect the value
of Console.IsOutputRedirected. This is how Microsoft's implementation
behaves.
2013-07-04 21:06:13 -04:00
Zoltan Varga e779592fb6 Make synchronized wrappers of generic methods generic the same way it is done with delegate invokes. 2013-07-05 01:02:10 +02:00
Zoltan Varga 18a3253788 Avoid passing class pointers to some marshal icalls since its not aot compatible. Fixes #12595. 2013-07-04 23:42:07 +02:00
Marek Safar ca1529df5b Interface members are hidden by class members if a type parameter has an effective base other than object 2013-07-04 14:52:25 +02:00
Alex Rønne Petersen 5a161c7d2d Merge pull request #684 from jack-pappas/patch-7
Clean up preprocessor ifdefs in mono_thread_get_stack_bounds and fix the way thread stack information is retrieved on BSD
2013-07-03 18:03:55 -07:00
Zoltan Varga 9bb552dcc0 Disable a failing System.Core test for mt (#12987). 2013-07-04 01:23:33 +02:00
tritao 4beada2892 Added MONO_API macro to annotate and control visibility of public (exported) APIs.
This is especially useful for Windows since this way there is no need to maintain a separate .def file with exports which is usually out-of-sync with the latest revisions. This could also be used to control visibility with GCC/Clang so there would be no need for MONO_INTERNAL (could be removed while changing the default visibility to hidden).
2013-07-04 00:16:31 +01:00
Jack Pappas d63cedf256 Clean up preprocessor ifdefs in mono_thread_get_stack_bounds and fix the way thread stack information is retrieved on BSD
Cleaned up the heavily-nested preprocessor ifdefs. The code within the function was extremely difficult to understand because of the nested preprocessor directives, which has led to a number of avoidable configuration-related bugs. I've de-nested the ifdefs into a mostly-flat style, where we check for each platform just once and the entirety of the code for that platform falls under that single check. This improves the readability of the code and should fix the configuration-related issues on some platforms.

This code also fixes an issue where thread-stack information wasn't retrieved correctly on BSD-based systems; now the platform is detected correctly and the `pthread_attr_get_np` function used to retrieve the information.

This subsumes pull-request #553, which couldn't be merged with the current master branch due to several changes which were made to the `mono_thread_get_stack_bounds` function since that pull request was submitted. This commit also keeps the OpenBSD-related code for auditing purposes, though it may be removed later if testing shows the "generic" BSD handler works for OpenBSD.
2013-07-03 18:51:53 -04:00
Martin Baulig ffe8719327 [xbuild] / [PCL]: Report an error for unsupported / missing PCL Profiles.
We previously only reported a warning, then failed later with tons of
"The predefined type `System.Object' is not defined or imported", which
was very confusing to the user.

We now distinguish between missing Reference Assemblies (ie. none of
them are installed) and the requested profile not being available, reporting
a meaningful error message.
2013-07-03 21:32:14 +02:00
Zoltan Varga 432633827b Update the Mono LLVM EH Frame reading code to match llvm 5f3329c6d97bb765dc54592367087d9ce8cd0040. 2013-07-03 19:45:26 +02:00
Marek Safar 5d36460657 Update ast visitor 2013-07-03 18:38:18 +02:00
Marek Safar e147105e52 Loading of nested type of missing type needs to create another missing type. Fixes #12989 2013-07-03 17:39:50 +02:00
Alex Rønne Petersen 2c5cf355d8 Rename the POSIX MonoThreadInfo::suspend_semaphore field to begin_suspend_semaphore.
Unbreaks the Linux build.
2013-07-03 16:21:35 +02:00
Rodrigo Kumpera 45d70b772a Revert "Remove a duplicate field in mono-threads.h breaking the build on some systems."
This reverts commit 3600480ced.

This the wrong fix.
2013-07-03 09:33:52 -04:00
Marek Safar 0f05bb55f4 Add await support in to evaluator and REPL 2013-07-03 14:57:41 +02:00
Marek Safar b84ad279fb Better exception for unmarked labels 2013-07-03 14:57:40 +02:00
Alex Rønne Petersen 3600480ced Remove a duplicate field in mono-threads.h breaking the build on some systems. 2013-07-03 14:49:13 +02:00
Zoltan Varga 2bc6e4b228 Fix the implementation of sext.i4/zext.i4 for LLVM. Fixes test_0_regress_11058 () on amd64. 2013-07-03 03:44:44 +02:00
Rodrigo Kumpera 51c7b8892d Add regression tests for the last 3 fixes. 2013-07-02 18:50:36 -04:00
Rodrigo Kumpera e2ac2a9e45 [runtime]Replace suspend safe locks with semaphores as darwin's implementation is not reliable.
* mono-threads.c: On OSX, suspend safe locks are subject to a race condition
	where the lock is unlocked but a thread is blocked waiting for it.

	Semaphores are significantly slower as they always transition to the kernel, but given
	the two affected locks are taken very sporadically, there's nothing to worry here.
2013-07-02 18:42:26 -04:00
Rodrigo Kumpera 576dfed659 Introduce MonoThreadInfo::inside_critical_region to avoid suspending threads that are
dealing with suspended threads. One cannot reliably suspend a thread in the middle
of inspecting another one without the risk of deadlocking.

It usually goes like this:

thread 2:
	suspend thread 3, thread 3 is in the middle of some critical code.

thread 1:
	suspend thread 2 while probing for state of 3;
	try to suspend thread 3, fail to resume since it's on critical code.
2013-07-02 18:42:26 -04:00
Rodrigo Kumpera 2fa83f0a8c Suspend the world when cleaning up a domain as it's unsafe to walk the nursery with the world running. 2013-07-02 18:42:26 -04:00
Gerardo García Peña 72ed65fdd8 Added counter mode in InternalGetChars.
Added methods InternalGetCharsCount and InternalGetCharsEncode for improving readability.
Accept zero-length input buffer in 'InternalGetBytesDecode/Count' for processing void char buffers.
Removed a redundant 'unsafe' keyword.
2013-05-23 17:12:02 +02:00
Gerardo García Peña bf9b74f05a bugfix: accept zero-length input buffer in 'InternalGetChars' for building void strings. 2013-05-23 15:57:38 +02:00
Gerardo García Peña c22ce0e053 Reverted all changes in 'System.Text/Encoding.cs' and disabled the emitIdentifier feature in the new 'System.Text/UTF8Encoding.cs'. 2013-05-23 15:43:27 +02:00
Gerardo García Peña 34aa103a3c Added counter mode in InternalGetBytes.
Added methods InternalGetBytesCount and InternalGetBytesEncode for improving readability.
2013-05-23 15:39:12 +02:00
Gerardo García Peña ade6a99d9e By default return an 'UTF8Unmarked' object. Removed unused 'utf8EncodingWithMarkers' attribute. 2013-05-23 12:53:15 +02:00
Gerardo García Peña 6ad7f75a37 in test SufficientByteArray() when !NET_2_0 unexpected exceptions should be forwarded. 2013-05-23 08:43:13 +02:00
Gerardo García Peña ce246f6a5b - improved flush handling in encoder/decoder for fixing regression bug #565129
- fixed some checks to satisfy test 'ConvertZeroCharacters'.
2013-05-22 18:53:13 +02:00
Gerardo García Peña 062dfd03eb Accept a null input/output buffer in InternalGetBytes()/InternalGetChars() if its length is zero.
Throw ArgumentException in GetBytes()/GetChars() if no enough output buffer space.
2013-05-21 15:51:18 +02:00
Gerardo García Peña d624211706 MS.NET implementation returns 1000 not 625. 2013-05-21 13:43:23 +02:00
Gerardo García Peña b87ca2196c bugfixed returned charsUsed counter 2013-05-21 13:41:13 +02:00
Gerardo García Peña 05643bef22 MS.NET implementation returns 1000 not 625. 2013-05-21 12:26:49 +02:00
Gerardo García Peña 34222916bf Merge branch 'master' of https://github.com/mono/mono 2013-04-29 13:02:18 +02:00
Gerardo García Peña 4c7bcaaca3 some minor code style changes 2013-04-29 08:30:55 +02:00
Gerardo García Peña c9e3b37bb8 Disable BOM preamble in UTF8 by default (following best practices). 2013-04-29 08:09:23 +02:00
Gerardo García Peña b07a494bb6 Merge remote-tracking branch 'upstream/master' 2013-04-25 08:40:45 +02:00
Gerardo García Peña a93fa79df7 Rewrite of core coder & decoder functions to fix several bugs and limitations, and improve error handling. 2013-04-25 07:58:49 +02:00
Gerardo García Peña 1eb5cd8654 removed index check because (1) it cannot be checked in this context and (2) it
only explains when a bad sequence started in the current or past buffer (in
this case it would take a negative value).
2013-04-12 00:12:29 +02:00
Gerardo García Peña 026a80eea2 removed index check because (1) it cannot be checked in this context and (2) it
only explains when a bad sequence started in the current or past buffer (in
this case it would take a negative value).
2013-04-12 00:06:16 +02:00
Gerardo García Peña e62924259a Implemented method 'IsUnknownSurrogate()'. 2013-04-03 17:26:14 +02:00
Gerardo García Peña 8f6a053b80 Refactorized Convert(char[], int, ...) to use the pointer version. 2013-04-03 17:24:35 +02:00
Gerardo García Peña a0a12c128d Refactorized convert(byte[], int, ...), now uses the pointer version. 2013-04-03 17:21:58 +02:00
Jonathan Shore e6b8be8cba minor fix for bug 9520:
- socket configuration attempts to determine if system supports ipv6
- checks app configuration, but configuration throws exception if called from embedded context
- solution is to put a try/catch guard and fall to an alternative test for ipv6
2013-03-16 11:34:59 -04:00
967 changed files with 46882 additions and 6890 deletions

No files matched your search

+1 -1
View File
@@ -55,7 +55,7 @@ _ReSharper*/
~$*
# Autotools-generated files
Makefile
/Makefile
Makefile.in
aclocal.m4
autom4te.cache
Regular → Executable
+93 -41
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [3.2.1],
AC_INIT(mono, [3.3.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README])
@@ -105,22 +105,6 @@ case "$host" in
if test "x$host" == "x$build" -a "x$host" == "x$target"; then
AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32])
fi
#
# gcc-3/g++-3 are from the gcc-core/gcc-g++ cygwin packages.
# Other gcc packages will not work:
# - the gcc-4 packages no longer support -mno-cygwin
# - the mingw-gcc packages produce executables which depends on a libgcc<...>
# dll, which means we would have to distribute that file too.
#
if test "x$CC" != "x"; then
AC_ERROR(Don't set CC. mono can only be compiled with gcc-3 from the 'gcc-core' package)
fi
CC="gcc-3.exe -mno-cygwin -g"
CXX="g++-3.exe -mno-cygwin -g"
# So libgc configure gets -mno-cygwin
export CC
export CXX
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -mno-cygwin"
else
target_win32=yes
AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32/MinGW])
@@ -130,8 +114,8 @@ case "$host" in
# Windows 2000 is required that includes Internet Explorer 5.01
CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
libmono_cflags="-mno-cygwin -mms-bitfields -mwindows"
libmono_ldflags="-mno-cygwin -mms-bitfields -mwindows"
libmono_cflags="-mms-bitfields -mwindows"
libmono_ldflags="-mms-bitfields -mwindows"
libdl=
libgc_threads=win32
gc_default=included
@@ -491,6 +475,12 @@ AC_TRY_LINK([#include <math.h>], [
# We'll have to use signals
AC_MSG_RESULT(no)
])
# mingw
AC_CHECK_FUNCS(_finite, , AC_MSG_CHECKING(for _finite in math.h)
AC_TRY_LINK([#include <math.h>],
[ _finite(0.0); ],
AC_DEFINE(HAVE__FINITE, 1, [Have _finite in -lm]) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)))
# for Linux statfs support
AC_CHECK_HEADERS(linux/magic.h)
@@ -1150,6 +1140,8 @@ if test x$target_win32 = xno; then
AC_CHECK_HEADERS(execinfo.h)
AC_CHECK_HEADERS(sys/auxv.h)
AC_CHECK_FUNCS(getgrgid_r)
AC_CHECK_FUNCS(getgrnam_r)
AC_CHECK_FUNCS(getpwnam_r)
@@ -1583,6 +1575,10 @@ if test x$target_win32 = xno; then
AC_MSG_RESULT(disabled)
else
AC_TRY_RUN([
#if defined(__APPLE__) && defined(__clang__)
#error "__thread does not currently work with clang on Mac OS X"
#endif
#include <pthread.h>
__thread int i;
static int res1, res2;
@@ -2375,14 +2371,18 @@ if test "x$enable_llvm" = "xyes"; then
;;
esac
# 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 is compiled with -fno-rtti, so we need this too, since our classes inherit
# from LLVM classes.
LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
if test "x$host" != "x$target"; then
# No need for jit libs
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter`
else
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
fi
LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
# Should be something like '2.6' or '2.7svn'
@@ -2486,7 +2486,7 @@ case "$host" in
have_visibility_hidden=no
sgen_supported=true
;;
cygwin*)
mingw*|cygwin*)
sgen_supported=true
have_visibility_hidden=no
;;
@@ -2592,9 +2592,9 @@ case "$host" in
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__ -DHAVE_ARMV6=1"
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
# libgc's gc_locks.h depends on this
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6"
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC"
sgen_supported=true
;;
arm*-linux*)
@@ -2616,7 +2616,7 @@ case "$host" in
# AOT_SUPPORTED="no"
# ;;
s390x-*-linux*)
TARGET=S390x;
TARGET=S390X;
arch_target=s390x;
ACCESS_UNALIGNED="yes"
JIT_SUPPORTED=yes
@@ -2636,7 +2636,7 @@ if test "x$host" != "x$target"; then
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__ -DHAVE_ARMV6=1"
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
jit_wanted=true
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
@@ -2725,7 +2725,6 @@ if test "x$host" != "x$target"; then
esac
fi
# FIXME: Define the others as well
case "$TARGET" in
X86)
AC_DEFINE(TARGET_X86, 1, [...])
@@ -2743,14 +2742,32 @@ POWERPC64)
AC_DEFINE(TARGET_POWERPC, 1, [...])
AC_DEFINE(TARGET_POWERPC64, 1, [...])
;;
S390x)
S390X)
AC_DEFINE(TARGET_S390X, 1, [...])
;;
MIPS)
AC_DEFINE(TARGET_MIPS, 1, [...])
;;
IA64)
AC_DEFINE(TARGET_IA64, 1, [...])
;;
SPARC)
AC_DEFINE(TARGET_SPARC, 1, [...])
;;
SPARC64)
AC_DEFINE(TARGET_SPARC64, 1, [...])
;;
esac
dnl Use GCC atomic ops if they work on the target.
if test x$GCC = "xyes"; then
case $TARGET in
X86 | AMD64 | ARM | POWERPC | POWERPC64 | MIPS)
AC_DEFINE(USE_GCC_ATOMIC_OPS, 1, [...])
;;
esac
fi
if test "x$target_mach" = "xyes"; then
if test "x$TARGET" = "xARM"; then
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
@@ -3035,18 +3052,54 @@ if test ${TARGET} = ARM; then
CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
unset fpu
if test x$cross_compiling = xno; then
AC_MSG_CHECKING(for ARMV6)
AC_TRY_RUN([
int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; }
], armv6=yes, armv6=no)
dnl *********************************************
dnl *** Check which ARM version(s) we can use ***
dnl *********************************************
AC_MSG_CHECKING(which ARM version to use)
AC_MSG_RESULT($armv6)
if test ${armv6} = yes; then
AC_DEFINE(HAVE_ARMV6, 1, "Host supports ARMV6 instructions")
# libgc's gc_locks.h depends on this
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6"
fi
AC_TRY_COMPILE([], [
#if !defined(__ARM_ARCH_5T__) && !defined(__ARM_ARCH_5TE__) && !defined(__ARM_ARCH_5TEJ__)
#error Not on ARM v5.
#endif
return 0;
], [
arm_v5=yes
], [])
AC_TRY_COMPILE([], [
#if !defined(__ARM_ARCH_6J__) && !defined(__ARM_ARCH_6ZK__) && !defined(__ARM_ARCH_6K__) && !defined(__ARM_ARCH_6T2__) && !defined(__ARM_ARCH_6M__)
#error Not on ARM v6.
#endif
return 0;
], [
arm_v5=yes
arm_v6=yes
], [])
AC_TRY_COMPILE([], [
#if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_7R__) && !defined(__ARM_ARCH_7EM__) && !defined(__ARM_ARCH_7M__) && !defined(__ARM_ARCH_7S__)
#error Not on ARM v7.
#endif
return 0;
], [
arm_v5=yes
arm_v6=yes
arm_v7=yes
], [])
if test x$arm_v5 = xyes; then
AC_DEFINE(HAVE_ARMV5, 1, [ARM v5])
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV5=1"
fi
if test x$arm_v6 = xyes; then
AC_DEFINE(HAVE_ARMV6, 1, [ARM v6])
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6=1"
fi
if test x$arm_v7 = xyes; then
AC_DEFINE(HAVE_ARMV7, 1, [ARM v7])
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV7=1"
fi
fi
@@ -3217,12 +3270,11 @@ AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
AM_CONDITIONAL(X86, test x$TARGET = xX86)
AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
AM_CONDITIONAL(ARM, test x$TARGET = xARM)
AM_CONDITIONAL(S390x, test x$TARGET = xS390x)
AM_CONDITIONAL(S390X, test x$TARGET = xS390X)
AM_CONDITIONAL(HOST_X86, test x$HOST = xX86)
AM_CONDITIONAL(HOST_AMD64, test x$HOST = xAMD64)
AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
+1 -1
View File
@@ -156,7 +156,7 @@ g_get_current_dir (void)
{
#ifdef __native_client__
char *buffer;
if ((buffer = getenv("NACL_PWD"))) {
if ((buffer = g_getenv("NACL_PWD"))) {
buffer = g_strdup(buffer);
} else {
buffer = g_strdup(".");
+1
View File
@@ -61,6 +61,7 @@ int mkstemp (char *tmp_template)
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_EXCL, _S_IREAD | _S_IWRITE);
}
/* FIXME: this will crash if utf16_template == NULL */
sprintf (tmp_template + strlen (tmp_template) - 6, "%S", utf16_template + wcslen (utf16_template) - 6);
g_free (utf16_template);
+58 -28
View File
@@ -174,14 +174,34 @@ gsize
g_iconv (GIConv cd, gchar **inbytes, gsize *inbytesleft,
gchar **outbytes, gsize *outbytesleft)
{
size_t inleft, outleft;
gsize inleft, outleft;
char *inptr, *outptr;
gunichar c;
int rc = 0;
#ifdef HAVE_ICONV
if (cd->cd != (iconv_t) -1)
return iconv (cd->cd, inbytes, inbytesleft, outbytes, outbytesleft);
if (cd->cd != (iconv_t) -1) {
/* Note: gsize may have a different size than size_t, so we need to
remap inbytesleft and outbytesleft to size_t's. */
size_t *outleftptr, *inleftptr;
size_t n_outleft, n_inleft;
if (inbytesleft) {
n_inleft = *inbytesleft;
inleftptr = &n_inleft;
} else {
inleftptr = NULL;
}
if (outbytesleft) {
n_outleft = *outbytesleft;
outleftptr = &n_outleft;
} else {
outleftptr = NULL;
}
return iconv (cd->cd, inbytes, inleftptr, outbytes, outleftptr);
}
#endif
if (outbytes == NULL || outbytesleft == NULL) {
@@ -640,7 +660,7 @@ gchar *
g_convert (const gchar *str, gssize len, const gchar *to_charset, const gchar *from_charset,
gsize *bytes_read, gsize *bytes_written, GError **err)
{
size_t outsize, outused, outleft, inleft, grow, rc;
gsize outsize, outused, outleft, inleft, grow, rc;
char *result, *outbuf, *inbuf;
gboolean flush = FALSE;
gboolean done = FALSE;
@@ -676,7 +696,7 @@ g_convert (const gchar *str, gssize len, const gchar *to_charset, const gchar *f
else
rc = g_iconv (cd, NULL, NULL, &outbuf, &outleft);
if (rc == (size_t) -1) {
if (rc == (gsize) -1) {
switch (errno) {
case E2BIG:
/* grow our result buffer */
@@ -901,7 +921,7 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
size_t inleft;
char *inptr;
gunichar c;
int n;
int u, n;
g_return_val_if_fail (str != NULL, NULL);
@@ -910,6 +930,7 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, "Conversions with embedded nulls must pass the string length");
return NULL;
}
len = strlen (str);
}
@@ -917,29 +938,18 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
inleft = len;
while (inleft > 0) {
if ((n = decode_utf8 (inptr, inleft, &c)) < 0) {
if (errno == EILSEQ) {
g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"Illegal byte sequence encounted in the input.");
} else if (items_read) {
/* partial input is ok if we can let our caller know... */
break;
} else {
g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
"Partial byte sequence encountered in the input.");
}
if (items_read)
*items_read = inptr - str;
if (items_written)
*items_written = 0;
return NULL;
} else if (c == 0 && !include_nuls)
if ((n = decode_utf8 (inptr, inleft, &c)) < 0)
goto error;
if (c == 0 && !include_nuls)
break;
outlen += g_unichar_to_utf16 (c, NULL);
if ((u = g_unichar_to_utf16 (c, NULL)) < 0) {
errno = EILSEQ;
goto error;
}
outlen += u;
inleft -= n;
inptr += n;
}
@@ -957,7 +967,8 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
while (inleft > 0) {
if ((n = decode_utf8 (inptr, inleft, &c)) < 0)
break;
else if (c == 0 && !include_nuls)
if (c == 0 && !include_nuls)
break;
outptr += g_unichar_to_utf16 (c, outptr);
@@ -968,6 +979,25 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
*outptr = '\0';
return outbuf;
error:
if (errno == EILSEQ) {
g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"Illegal byte sequence encounted in the input.");
} else if (items_read) {
/* partial input is ok if we can let our caller know... */
} else {
g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
"Partial byte sequence encountered in the input.");
}
if (items_read)
*items_read = inptr - str;
if (items_written)
*items_written = 0;
return NULL;
}
gunichar2 *
+1
View File
@@ -141,6 +141,7 @@ g_module_error (void)
TCHAR* buf = NULL;
DWORD code = GetLastError ();
/* FIXME: buf must not be NULL! */
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL,
code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, 0, NULL);
+1 -2
View File
@@ -235,9 +235,8 @@ g_string_truncate (GString *string, gsize len)
g_return_val_if_fail (string != NULL, string);
/* Silent return */
if (len < 0 || len >= string->len) {
if (len >= string->len)
return string;
}
string->len = len;
string->str[len] = 0;
+1 -1
View File
@@ -969,7 +969,7 @@ word n;
}
# endif
expansion_slop = WORDS_TO_BYTES(min_words_allocd()) + 4*MAXHINCR*HBLKSIZE;
if (GC_last_heap_addr == 0 && !((word)space & SIGNB)
if ((GC_last_heap_addr == 0 && !((word)space & SIGNB))
|| (GC_last_heap_addr != 0 && GC_last_heap_addr < (ptr_t)space)) {
/* Assume the heap is growing up */
GC_greatest_plausible_heap_addr =
+3 -37
View File
@@ -231,46 +231,12 @@
# define NACL_ALIGN()
# endif
inline static int GC_test_and_set(volatile unsigned int *addr) {
#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
int ret, tmp;
__asm__ __volatile__ (
"1:\n"
NACL_ALIGN()
MASK_REGISTER("%3", "al")
"ldrex %0, [%3]\n"
MASK_REGISTER("%3", "al")
"strex %1, %2, [%3]\n"
"teq %1, #0\n"
"bne 1b\n"
: "=&r" (ret), "=&r" (tmp)
: "r" (1), "r" (addr)
: "memory", "cc");
return ret;
#else
int oldval;
/* SWP on ARM is very similar to XCHG on x86. Doesn't lock the
* bus because there are no SMP ARM machines. If/when there are,
* this code will likely need to be updated. */
/* See linuxthreads/sysdeps/arm/pt-machine.h in glibc-2.1 */
__asm__ __volatile__(MASK_REGISTER("%2", "al")
"swp %0, %1, [%2]"
: "=&r"(oldval)
: "r"(1), "r"(addr)
: "memory");
return oldval;
#endif
return (int) __sync_lock_test_and_set (addr, 1);
}
# define GC_TEST_AND_SET_DEFINED
inline static void GC_clear(volatile unsigned int *addr) {
#ifdef HAVE_ARMV6
/* Memory barrier */
#ifdef __native_client__
/* NaCl requires ARMv7 CPUs. */
__asm__ __volatile__("dsb" : : : "memory");
#else
__asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory");
#endif
#endif
__sync_synchronize ();
*(addr) = 0;
}
# define GC_CLEAR_DEFINED
+1 -1
View File
@@ -22,7 +22,7 @@
# include "private/gc_priv.h"
map_entry_type * GC_invalid_map = 0;
static max_valid_offset = 0;
static word max_valid_offset = 0;
/* Invalidate the object map associated with a block. Free blocks */
/* are identified by invalid maps. */
+1 -1
View File
@@ -165,7 +165,7 @@ void (*GC_is_valid_displacement_print_proc) GC_PROTO((GC_PTR)) =
pdispl = HBLKDISPL(p);
map_entry = MAP_ENTRY((hhdr -> hb_map), pdispl);
if (map_entry == OBJ_INVALID
|| sz > MAXOBJBYTES && (ptr_t)p >= (ptr_t)h + sz) {
|| (sz > MAXOBJBYTES && (ptr_t)p >= (ptr_t)h + sz)) {
goto fail;
}
return(p);
+1 -1
View File
@@ -124,7 +124,7 @@ gcc-mingw and as packages.
Assembler command. The default is "as".
.TP
.I "CC"
C compiler command. The default is "cc" under Linux and "gcc -mno-cygwin"
C compiler command. The default is "cc" under Linux and "gcc"
under Windows.
.TP
.I "MONO_BUNDLED_OPTIONS"
+5 -1
View File
@@ -418,7 +418,7 @@ the global assembly cache is always trusted.
.TP
\fB--server\fR
Configures the virtual machine to be better suited for server
operations (currently, a no-op).
operations (currently, allows a heavier threadpool initialization).
.TP
\fB--verify-all\fR
Verifies mscorlib and assemblies in the global
@@ -1628,6 +1628,10 @@ for example, to see managed frame names on gdb backtraces.
Enables the maximum JIT verbosity for the specified method. This is
very helpfull to diagnose a miscompilation problems of a specific
method.
.TP
\fBMONO_VERBOSE_HWCAP\fR
If set, makes the JIT output information about detected CPU features
(such as SSE, CMOV, FCMOV, etc) to stdout.
.SH VALGRIND
If you want to use Valgrind, you will find the file `mono.supp'
useful, it contains the suppressions for the GC which trigger
+14 -5
View File
@@ -4,6 +4,7 @@ outfile=$1
incfile=$2
excfile=$3
extfile=$4
extexcfile=$5
process_includes_1() {
sed -e '/^[ \t]*$/d' -e '/^[ \t]*#/d' $1 > $2
@@ -39,16 +40,24 @@ fi
sort -u $outfile.inc > $outfile.inc_s
rm -f $outfile.inc
if test -z "$excfile"; then
mv $outfile.inc_s $outfile
else
if test -n "$excfile"; then
process_includes $excfile $outfile.exc
fi
sort -u $outfile.exc > $outfile.exc_s
rm -f $outfile.exc
if test -n "$extexcfile"; then
process_includes $extexcfile $outfile.ext_exc
cat $outfile.ext_exc >> $outfile.exc
rm -f $outfile.ext_exc
fi
if test -f $outfile.exc; then
sort -u $outfile.exc > $outfile.exc_s
rm -f $outfile.exc
sort -m $outfile.inc_s $outfile.exc_s | uniq -u > $outfile
rm -f $outfile.inc_s $outfile.exc_s
else
mv $outfile.inc_s $outfile
fi
+8 -1
View File
@@ -23,11 +23,18 @@ else
EXTENSION_include = $(wildcard $(PROFILE)_opt_$(LIBRARY).sources)
endif
ifdef EXTENSION_MODULE
EXTENSION_exclude = $(wildcard $(topdir)/../../mono-extensions/mcs/$(thisdir)/$(PROFILE)_$(LIBRARY).exclude.sources)
else
EXTENSION_exclude = $(wildcard $(PROFILE)_opt_$(LIBRARY).exclude.sources)
endif
# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's
# We don't include it in the dependencies since it isn't always created
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh $(EXTENSION_include)
@echo Creating the per profile list $@ ...
$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)' '$(EXTENSION_include)'
$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)' '$(EXTENSION_include)' '$(EXTENSION_exclude)'
endif
PLATFORM_excludes := $(wildcard $(LIBRARY).$(PLATFORM)-excludes)
+20
View File
@@ -0,0 +1,20 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:FULL_AOT_RUNTIME -d:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
# the tuner takes care of the install
NO_INSTALL = yes
+2 -2
View File
@@ -12,9 +12,9 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -d:DISABLE_REMOTING -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -d:DISABLE_REMOTING -d:DISABLE_COM -d:FULL_AOT_RUNTIME -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
# the tuner takes care of the install
NO_INSTALL = yes
NO_INSTALL = yes
+2 -2
View File
@@ -14,9 +14,9 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 4.5
FRAMEWORK_VERSION = 2.1
# This is utility build only
NO_INSTALL = yes
+2
View File
@@ -81,8 +81,10 @@ include $(topdir)/build/config-default.make
ifndef PLATFORM
ifeq ($(OS),Windows_NT)
$(info *** Assuming PLATFORM is 'win32'.)
PLATFORM = win32
else
$(info *** Assuming PLATFORM is 'linux'.)
PLATFORM = linux
endif
endif
@@ -29,4 +29,45 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.IQueryable<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.IOrderedQueryable<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.IQueryProvider))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.Expression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.BinaryExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ConditionalExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ConstantExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ElementInit))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.LambdaExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.Expression<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ExpressionType))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ExpressionVisitor))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.InvocationExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ListInitExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberBinding))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberAssignment))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberBindingType))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberInitExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberListBinding))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MemberMemberBinding))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.MethodCallExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.NewArrayExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.NewExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ParameterExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.TypeBinaryExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.UnaryExpression))]
#if !FULL_AOT_RUNTIME
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.BlockExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.CatchBlock))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.DebugInfoExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.DefaultExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.GotoExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.GotoExpressionKind))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.IndexExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.LabelExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.LabelTarget))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.LoopExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.RuntimeVariablesExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.SwitchCase))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.SwitchExpression))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.SymbolDocumentInfo))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.TryExpression))]
#endif
+3 -27
View File
@@ -68,6 +68,7 @@ common_dirs := \
Novell.Directory.Ldap \
Mono.Security.Win32 \
System.DirectoryServices \
System.DirectoryServices.Protocols \
RabbitMQ.Client \
Mono.Messaging \
System.Messaging \
@@ -164,33 +165,7 @@ monodroid_dirs := \
System.Net.Http
monotouch_runtime_dirs := \
corlib \
System \
System.XML \
Mono.Posix \
System.Core \
Mono.Security \
System \
System.Security \
System.Configuration \
System \
System.XML \
$(resgen_dir) \
System.Drawing \
System.Transactions \
System.EnterpriseServices \
Mono.Data.Tds \
System.Data \
Accessibility \
Mono.WebBrowser \
System.Runtime.Serialization.Formatters.Soap \
Managed.Windows.Forms \
Mono.Data.Sqlite \
System.Web.ApplicationServices \
System.Web \
Mono.Web \
System.Web.Services \
System.Web
corlib
net_3_5_only_dirs := \
Microsoft.Build.Framework \
@@ -257,6 +232,7 @@ net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compi
monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
monotouch_SUBDIRS := $(mobile_dirs)
monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_dirs)
mobile_SUBDIRS := $(mobile_dirs)
net_3_5_SUBDIRS := $(net_3_5_only_dirs)
net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs)
+1 -1
View File
@@ -177,7 +177,7 @@ SWFresourcelist()
{
cat $Resource | while read SRC; do
SRC=`echo $SRC | $tr '/' '\\\\'`
SRC=`echo $SRC | sed 's/-resource://' | gawk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"`
SRC=`echo $SRC | sed 's/-resource://' | awk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"`
cat << EOT
<File
@@ -60,6 +60,8 @@ namespace Microsoft.Build.Tasks
Log.LogWarning ("Unable to find framework corresponding to the target framework moniker '{0}'. " +
"Framework assembly references will be resolved from the GAC, which might not be " +
"the intended behavior.", TargetFrameworkMoniker);
if (moniker.Identifier.Equals (".NETPortable"))
return CheckPclReferenceAssemblies (moniker);
return true;
}
@@ -69,6 +71,17 @@ namespace Microsoft.Build.Tasks
return true;
}
bool CheckPclReferenceAssemblies (FrameworkMoniker moniker)
{
// Check for a supported profile
var check = new FrameworkMoniker (".NETPortable", "v4.0", "Profile24");
if (GetFrameworkDirectoriesForMoniker (check) != null)
Log.LogError ("Unsupported PCL Profile '{0}'.", moniker);
else
Log.LogError ("PCL Reference Assemblies not installed.");
return false;
}
Framework GetFrameworkDirectoriesForMoniker (FrameworkMoniker moniker)
{
string dirs = String.Join (PathSeparatorAsString, new string [] {
@@ -59,3 +59,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: InternalsVisibleTo ("PlayScript.Core, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
@@ -41,9 +41,10 @@ namespace Microsoft.CSharp.RuntimeBinder
IList<CSharpArgumentInfo> argumentInfo;
readonly CSharpBinderFlags flags;
readonly Type context;
readonly ExpressionType operation;
public CSharpBinaryOperationBinder (ExpressionType operation, CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
: base (operation)
: base (GetOperation (operation))
{
this.argumentInfo = new ReadOnlyCollectionBuilder<CSharpArgumentInfo> (argumentInfo);
if (this.argumentInfo.Count != 2)
@@ -51,12 +52,24 @@ namespace Microsoft.CSharp.RuntimeBinder
this.flags = flags;
this.context = context;
this.operation = operation;
}
static ExpressionType GetOperation (ExpressionType exprType)
{
switch (exprType) {
case (ExpressionType) 0x80000:
case (ExpressionType) 0x80001:
return ExpressionType.Extension;
default:
return exprType;
}
}
Compiler.Binary.Operator GetOperator (out bool isCompound)
{
isCompound = false;
switch (Operation) {
switch (operation) {
case ExpressionType.Add:
return Compiler.Binary.Operator.Addition;
case ExpressionType.AddAssign:
@@ -123,6 +136,10 @@ namespace Microsoft.CSharp.RuntimeBinder
case ExpressionType.SubtractAssign:
isCompound = true;
return Compiler.Binary.Operator.Subtraction;
case (ExpressionType) 0x80000:
return Compiler.Binary.Operator.StrictEquality;
case (ExpressionType) 0x80001:
return Compiler.Binary.Operator.StrictInequality;
default:
throw new NotImplementedException (Operation.ToString ());
}
@@ -66,11 +66,14 @@ namespace Microsoft.CSharp.RuntimeBinder
}
public DynamicMetaObject Bind (DynamicContext ctx, Type callingType)
{
return Bind (new Compiler.ResolveContext (new RuntimeBinderContext (ctx, callingType), ResolveOptions));
}
public DynamicMetaObject Bind (Compiler.ResolveContext rc)
{
Expression res;
try {
var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, callingType), ResolveOptions);
// Static typemanager and internal caches are not thread-safe
lock (resolver) {
expr = expr.Resolve (rc, Compiler.ResolveFlags.VariableOrValue);
@@ -55,4 +55,7 @@
../../build/common/Consts.cs
../../tools/monop/outline.cs
../../mcs/cs-parser.cs
../../mcs/ps-parser.cs
../../mcs/ps-tokenizer.cs
../../mcs/playscript.cs
Assembly/AssemblyInfo.cs
@@ -193,6 +193,7 @@ public class Tests : TestsBase
public AStruct field_struct;
public object field_boxed_struct;
public GStruct<int> generic_field_struct;
public KeyValuePair<int, object> boxed_struct_field;
[ThreadStatic]
public static int tls_i;
public static bool is_attached = Debugger.IsAttached;
@@ -498,7 +499,7 @@ public class Tests : TestsBase
}
public static void vtypes () {
Tests t = new Tests () { field_struct = new AStruct () { i = 42, s = "S", k = 43 }, generic_field_struct = new GStruct<int> () { i = 42 }, field_boxed_struct = new AStruct () { i = 42 }};
Tests t = new Tests () { field_struct = new AStruct () { i = 42, s = "S", k = 43 }, generic_field_struct = new GStruct<int> () { i = 42 }, field_boxed_struct = new AStruct () { i = 42 }, boxed_struct_field = new KeyValuePair<int, object> (1, (long)42 ) };
AStruct s = new AStruct { i = 44, s = "T", k = 45 };
AStruct[] arr = new AStruct[] {
new AStruct () { i = 1, s = "S1" },
+38 -12
View File
@@ -135,6 +135,16 @@ public class DebuggerTests
return e;
}
Event step_until (ThreadMirror t, string method_name) {
Event e;
while (true) {
e = single_step (t);
if ((e as StepEvent).Method.Name == method_name)
break;
}
return e;
}
void check_arg_val (StackFrame frame, int pos, Type type, object eval) {
object val = frame.GetArgument (pos);
Assert.IsTrue (val is PrimitiveValue);
@@ -1325,6 +1335,17 @@ public class DebuggerTests
Assert.AreEqual ("AStruct", s.Type.Name);
AssertValue (42, s ["i"]);
// Check round tripping of boxed struct fields (#12354)
obj = o.GetValue (o.Type.GetField ("boxed_struct_field"));
o.SetValue (o.Type.GetField ("boxed_struct_field"), obj);
obj = o.GetValue (o.Type.GetField ("boxed_struct_field"));
s = obj as StructMirror;
AssertValue (1, s ["key"]);
obj = s ["value"];
Assert.IsTrue (obj is StructMirror);
s = obj as StructMirror;
AssertValue (42, s ["m_value"]);
// vtypes as arguments
s = frame.GetArgument (0) as StructMirror;
AssertValue (44, s ["i"]);
@@ -1361,11 +1382,7 @@ public class DebuggerTests
// this on vtype methods
e = run_until ("vtypes2");
// Skip nop
e = single_step (e.Thread);
e = single_step (e.Thread);
e = step_until (e.Thread, "foo");
frame = e.Thread.GetFrames () [0];
@@ -1380,11 +1397,7 @@ public class DebuggerTests
// this on static vtype methods
e = run_until ("vtypes3");
// Skip nop
e = single_step (e.Thread);
e = single_step (e.Thread);
e = step_until (e.Thread, "static_foo");
frame = e.Thread.GetFrames () [0];
@@ -1691,13 +1704,26 @@ public class DebuggerTests
Location l;
vm.Resume ();
while (true) {
vm.Resume ();
e = GetNextEvent ();
Assert.IsTrue (e is StepEvent);
if (e.Thread.GetFrames ()[0].Method.Name == "ln1")
break;
}
// Do an additional step over so we are not on the beginning line of the method
step_req.Disable ();
step_req.Depth = StepDepth.Over;
step_req.Enable ();
vm.Resume ();
e = GetNextEvent ();
Assert.IsTrue (e is StepEvent);
Assert.IsTrue (e is StepEvent);
l = e.Thread.GetFrames ()[0].Location;
Console.WriteLine (l);
Assert.AreEqual (3, l.ColumnNumber);
step_req.Disable ();
@@ -42,20 +42,7 @@ namespace Mono.Attach
}
public string GetWorkingDirectory () {
int len = 256;
while (true) {
StringBuilder sb = new StringBuilder (len);
int res = Syscall.readlink ("/proc/" + pid + "/cwd", sb);
if (res == -1)
throw new IOException ("Syscall.readlink () failed with error " + res + ".");
else if (res == len) {
len = len * 2;
} else {
return sb.ToString ();
}
}
return UnixPath.ReadLink ("/proc/" + pid + "/cwd");
}
/*
@@ -1,3 +1,4 @@
Mono.Unix/ReadlinkTest.cs
Mono.Unix/StdioFileStreamTest.cs
Mono.Unix/UnixEncodingTest.cs
Mono.Unix/UnixGroupTest.cs
@@ -3937,19 +3937,53 @@ namespace Mono.Unix.Native {
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
string newpath);
delegate long DoReadlinkFun (byte[] target);
// Helper function for readlink(string, StringBuilder) and readlinkat (int, string, StringBuilder)
static int ReadlinkIntoStringBuilder (DoReadlinkFun doReadlink, [Out] StringBuilder buf, ulong bufsiz)
{
// bufsiz > int.MaxValue can't work because StringBuilder can store only int.MaxValue chars
int bufsizInt = checked ((int) bufsiz);
var target = new byte [bufsizInt];
var r = doReadlink (target);
if (r < 0)
return checked ((int) r);
buf.Length = 0;
var chars = UnixEncoding.Instance.GetChars (target, 0, checked ((int) r));
// Make sure that at more bufsiz chars are written
buf.Append (chars, 0, System.Math.Min (bufsizInt, chars.Length));
if (r == bufsizInt) {
// may not have read full contents; fill 'buf' so that caller can properly check
buf.Append (new string ('\x00', bufsizInt - buf.Length));
}
return buf.Length;
}
// readlink(2)
// int readlink(const char *path, char *buf, size_t bufsize);
[DllImport (MPH, SetLastError=true,
EntryPoint="Mono_Posix_Syscall_readlink")]
public static extern int readlink (
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
string path, [Out] StringBuilder buf, ulong bufsiz);
// ssize_t readlink(const char *path, char *buf, size_t bufsize);
public static int readlink (string path, [Out] StringBuilder buf, ulong bufsiz)
{
return ReadlinkIntoStringBuilder (target => readlink (path, target), buf, bufsiz);
}
public static int readlink (string path, [Out] StringBuilder buf)
{
return readlink (path, buf, (ulong) buf.Capacity);
}
[DllImport (MPH, SetLastError=true,
EntryPoint="Mono_Posix_Syscall_readlink")]
private static extern long readlink (
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
string path, byte[] buf, ulong bufsiz);
public static long readlink (string path, byte[] buf)
{
return readlink (path, buf, (ulong) buf.LongLength);
}
[DllImport (LIBC, SetLastError=true)]
public static extern int unlink (
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
@@ -4226,18 +4260,28 @@ namespace Mono.Unix.Native {
}
// readlinkat(2)
// int readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsize);
[DllImport (MPH, SetLastError=true,
EntryPoint="Mono_Posix_Syscall_readlinkat")]
public static extern int readlinkat (int dirfd,
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
string pathname, [Out] StringBuilder buf, ulong bufsiz);
// ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsize);
public static int readlinkat (int dirfd, string pathname, [Out] StringBuilder buf, ulong bufsiz)
{
return ReadlinkIntoStringBuilder (target => readlinkat (dirfd, pathname, target), buf, bufsiz);
}
public static int readlinkat (int dirfd, string pathname, [Out] StringBuilder buf)
{
return readlinkat (dirfd, pathname, buf, (ulong) buf.Capacity);
}
[DllImport (MPH, SetLastError=true,
EntryPoint="Mono_Posix_Syscall_readlinkat")]
private static extern long readlinkat (int dirfd,
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
string pathname, byte[] buf, ulong bufsiz);
public static long readlinkat (int dirfd, string pathname, byte[] buf)
{
return readlinkat (dirfd, pathname, buf, (ulong) buf.LongLength);
}
[DllImport (LIBC, SetLastError=true)]
public static extern int symlinkat (
[MarshalAs (UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileNameMarshaler))]
+43 -53
View File
@@ -209,69 +209,59 @@ namespace Mono.Unix {
// Read the specified symbolic link. If the file isn't a symbolic link,
// return null; otherwise, return the contents of the symbolic link.
//
// readlink(2) is horribly evil, as there is no way to query how big the
// symlink contents are. Consequently, it's trial and error...
internal static string ReadSymbolicLink (string path)
{
StringBuilder buf = new StringBuilder (256);
do {
int r = Native.Syscall.readlink (path, buf);
if (r < 0) {
Native.Errno e;
switch (e = Native.Stdlib.GetLastError()) {
case Native.Errno.EINVAL:
// path isn't a symbolic link
return null;
default:
UnixMarshal.ThrowExceptionForError (e);
break;
}
}
else if (r == buf.Capacity) {
buf.Capacity *= 2;
}
else
return buf.ToString (0, r);
} while (true);
}
// Read the specified symbolic link. If the file isn't a symbolic link,
// return null; otherwise, return the contents of the symbolic link.
//
// readlink(2) is horribly evil, as there is no way to query how big the
// symlink contents are. Consequently, it's trial and error...
private static string ReadSymbolicLink (string path, out Native.Errno errno)
{
errno = (Native.Errno) 0;
StringBuilder buf = new StringBuilder (256);
do {
int r = Native.Syscall.readlink (path, buf);
if (r < 0) {
errno = Native.Stdlib.GetLastError ();
return null;
}
else if (r == buf.Capacity) {
buf.Capacity *= 2;
}
else
return buf.ToString (0, r);
} while (true);
string target = TryReadLink (path);
if (target == null) {
Native.Errno errno = Native.Stdlib.GetLastError ();
if (errno != Native.Errno.EINVAL)
UnixMarshal.ThrowExceptionForError (errno);
}
return target;
}
public static string TryReadLink (string path)
{
Native.Errno errno;
return ReadSymbolicLink (path, out errno);
byte[] buf = new byte[256];
do {
long r = Native.Syscall.readlink (path, buf);
if (r < 0)
return null;
else if (r == buf.Length)
buf = new byte[checked (buf.LongLength * 2)];
else
return UnixEncoding.Instance.GetString (buf, 0, checked ((int) r));
} while (true);
}
public static string TryReadLinkAt (int dirfd, string path)
{
byte[] buf = new byte[256];
do {
long r = Native.Syscall.readlinkat (dirfd, path, buf);
if (r < 0)
return null;
else if (r == buf.Length)
buf = new byte[checked (buf.LongLength * 2)];
else
return UnixEncoding.Instance.GetString (buf, 0, checked ((int) r));
} while (true);
}
public static string ReadLink (string path)
{
Native.Errno errno;
path = ReadSymbolicLink (path, out errno);
if (errno != 0)
UnixMarshal.ThrowExceptionForError (errno);
return path;
string target = TryReadLink (path);
if (target == null)
UnixMarshal.ThrowExceptionForLastError ();
return target;
}
public static string ReadLinkAt (int dirfd, string path)
{
string target = TryReadLinkAt (dirfd, path);
if (target == null)
UnixMarshal.ThrowExceptionForLastError ();
return target;
}
public static bool IsPathRooted (string path)
@@ -56,19 +56,18 @@ namespace Mono.Unix {
public string ContentsPath {
get {
return ReadLink ();
return UnixPath.ReadLink (FullPath);
}
}
public bool HasContents {
get {
return TryReadLink () != null;
return UnixPath.TryReadLink (FullPath) != null;
}
}
public UnixFileSystemInfo GetContents ()
{
ReadLink ();
return UnixFileSystemInfo.GetFileSystemEntry (
UnixPath.Combine (UnixPath.GetDirectoryName (FullPath),
ContentsPath));
@@ -103,23 +102,6 @@ namespace Mono.Unix {
{
return Native.Syscall.lstat (path, out stat) == 0;
}
private string ReadLink ()
{
string r = TryReadLink ();
if (r == null)
UnixMarshal.ThrowExceptionForLastError ();
return r;
}
private string TryReadLink ()
{
StringBuilder sb = new StringBuilder ((int) base.Length+1);
int r = Native.Syscall.readlink (FullPath, sb);
if (r == -1)
return null;
return sb.ToString (0, r);
}
}
}
@@ -0,0 +1,288 @@
//
// readlink() / readlinkat() Test Cases
//
// Authors:
// Steffen Kiess ([email protected])
//
// Copyright (C) 2013 Steffen Kiess
//
using System;
using System.IO;
using System.Text;
using Mono.Unix;
using Mono.Unix.Native;
using NUnit.Framework;
namespace MonoTests.Mono.Unix
{
[TestFixture, Category ("NotDotNet")]
public class ReadlinkTest {
static string[] Targets = {
// Simple test cases
"a",
"test",
// With non-ASCII characters
"ä",
"test ö test",
// With non-UTF8 bytes
UnixEncoding.Instance.GetString (new byte[] {0xff, 0x80, 0x41, 0x80}),
// Size is roughly initial size of buffer
new string ('a', 255),
new string ('a', 256),
new string ('a', 257),
// With non-ASCII characters, size is roughly initial size of buffer
"ä" + new string ('a', 253), // 254 chars, 255 bytes
"ä" + new string ('a', 254), // 255 chars, 256 bytes
"ä" + new string ('a', 255), // 256 chars, 257 bytes
"ä" + new string ('a', 256), // 257 chars, 258 bytes
new string ('a', 253) + "ä", // 254 chars, 255 bytes
new string ('a', 254) + "ä", // 255 chars, 256 bytes
new string ('a', 255) + "ä", // 256 chars, 257 bytes
new string ('a', 256) + "ä", // 257 chars, 258 bytes
// With non-UTF8 bytes, size is roughly initial size of buffer
"\0\u00ff" + new string ('a', 253), // 255 chars, 254 bytes
"\0\u00ff" + new string ('a', 254), // 256 chars, 255 bytes
"\0\u00ff" + new string ('a', 255), // 257 chars, 256 bytes
"\0\u00ff" + new string ('a', 256), // 258 chars, 257 bytes
new string ('a', 253) + "\0\u00ff", // 255 chars, 254 bytes
new string ('a', 254) + "\0\u00ff", // 256 chars, 255 bytes
new string ('a', 255) + "\0\u00ff", // 257 chars, 256 bytes
new string ('a', 256) + "\0\u00ff", // 258 chars, 257 bytes
};
bool HaveReadlinkAt;
string TempFolder;
int TempFD;
[SetUp]
public void SetUp ()
{
HaveReadlinkAt = false;
try {
Syscall.readlinkat (-1, "", new byte[1]);
HaveReadlinkAt = true;
} catch (EntryPointNotFoundException) {
}
TempFolder = Path.Combine (Path.GetTempPath (), this.GetType ().FullName);
if (Directory.Exists (TempFolder))
//Directory.Delete (TempFolder, true); // Fails for long link target paths
new UnixDirectoryInfo (TempFolder).Delete (true);
Directory.CreateDirectory (TempFolder);
TempFD = Syscall.open (TempFolder, OpenFlags.O_RDONLY | OpenFlags.O_DIRECTORY);
if (TempFD < 0)
UnixMarshal.ThrowExceptionForLastError ();
}
[TearDown]
public void TearDown()
{
if (Syscall.close (TempFD) < 0)
UnixMarshal.ThrowExceptionForLastError ();
if (Directory.Exists (TempFolder))
//Directory.Delete (TempFolder, true); // Fails for long link target paths
new UnixDirectoryInfo (TempFolder).Delete (true);
}
void CreateLink (string s)
{
string link = UnixPath.Combine (TempFolder, "link");
//File.Delete (link); // Fails for long link target paths
if (Syscall.unlink (link) < 0 && Stdlib.GetLastError () != Errno.ENOENT)
UnixMarshal.ThrowExceptionForLastError ();
if (Syscall.symlink (s, link) < 0)
UnixMarshal.ThrowExceptionForLastError ();
}
[Test]
public void ReadLink ()
{
foreach (string s in Targets) {
string link = UnixPath.Combine (TempFolder, "link");
CreateLink (s);
var target = UnixPath.ReadLink (link);
Assert.AreEqual (s, target);
}
}
[Test]
public void ReadLinkAt ()
{
if (!HaveReadlinkAt)
return;
foreach (string s in Targets) {
CreateLink (s);
var target = UnixPath.ReadLinkAt (TempFD, "link");
Assert.AreEqual (s, target);
}
}
[Test]
public void TryReadLink ()
{
foreach (string s in Targets) {
string link = UnixPath.Combine (TempFolder, "link");
CreateLink (s);
var target = UnixPath.TryReadLink (link);
Assert.AreEqual (s, target);
}
}
[Test]
public void TryReadLinkAt ()
{
if (!HaveReadlinkAt)
return;
foreach (string s in Targets) {
CreateLink (s);
var target = UnixPath.TryReadLinkAt (TempFD, "link");
Assert.AreEqual (s, target);
}
}
[Test]
public void readlink_byte ()
{
foreach (string s in Targets) {
string link = UnixPath.Combine (TempFolder, "link");
CreateLink (s);
string target = null;
byte[] buf = new byte[256];
do {
long r = Syscall.readlink (link, buf);
if (r < 0)
UnixMarshal.ThrowExceptionForLastError ();
Assert.GreaterOrEqual (buf.Length, r);
if (r == buf.Length)
buf = new byte[checked (buf.Length * 2)];
else
target = UnixEncoding.Instance.GetString (buf, 0, checked ((int) r));
} while (target == null);
Assert.AreEqual (s, target);
}
}
[Test]
public void readlinkat_byte ()
{
if (!HaveReadlinkAt)
return;
foreach (string s in Targets) {
CreateLink (s);
string target = null;
byte[] buf = new byte[256];
do {
long r = Syscall.readlinkat (TempFD, "link", buf);
if (r < 0)
UnixMarshal.ThrowExceptionForLastError ();
Assert.GreaterOrEqual (buf.Length, r);
if (r == buf.Length)
buf = new byte[checked (buf.Length * 2)];
else
target = UnixEncoding.Instance.GetString (buf, 0, checked ((int) r));
} while (target == null);
Assert.AreEqual (s, target);
}
}
[Test]
public void readlink_char ()
{
foreach (string s in Targets) {
string link = UnixPath.Combine (TempFolder, "link");
CreateLink (s);
var sb = new StringBuilder (256);
do {
int oldCapacity = sb.Capacity;
int r = Syscall.readlink (link, sb);
Assert.AreEqual (oldCapacity, sb.Capacity);
if (r < 0)
UnixMarshal.ThrowExceptionForLastError ();
Assert.AreEqual (r, sb.Length);
Assert.GreaterOrEqual (sb.Capacity, r);
if (r == sb.Capacity)
checked { sb.Capacity *= 2; }
else
break;
} while (true);
var target = sb.ToString ();
Assert.AreEqual (s, target);
}
}
[Test]
public void readlinkat_char ()
{
if (!HaveReadlinkAt)
return;
foreach (string s in Targets) {
CreateLink (s);
var sb = new StringBuilder (256);
do {
int oldCapacity = sb.Capacity;
int r = Syscall.readlinkat (TempFD, "link", sb);
Assert.AreEqual (oldCapacity, sb.Capacity);
if (r < 0)
UnixMarshal.ThrowExceptionForLastError ();
Assert.AreEqual (r, sb.Length);
Assert.GreaterOrEqual (sb.Capacity, r);
if (r == sb.Capacity)
checked { sb.Capacity *= 2; }
else
break;
} while (true);
var target = sb.ToString ();
Assert.AreEqual (s, target);
}
}
[Test]
public void ReadlinkMultiByteChar ()
{
string link = UnixPath.Combine (TempFolder, "link");
CreateLink ("á");
var sb = new StringBuilder (2);
int res = Syscall.readlink (link, sb);
if (res < 0)
UnixMarshal.ThrowExceptionForLastError ();
Assert.AreEqual (res, 2);
Assert.AreEqual (sb.Length, 2);
Assert.AreEqual (sb.Capacity, 2);
Assert.AreEqual (sb.ToString (), "á\u0000");
}
}
}
@@ -0,0 +1,25 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class ArgumentError extends Error {
public function ArgumentError(message:String = "") {
super(message);
}
}
}
+115
View File
@@ -0,0 +1,115 @@
//
// Array.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
package {
public dynamic class Array
{
public static const CASEINSENSITIVE:uint = 1;
public static const DESCENDING:uint = 2;
public static const UNIQUESORT:uint = 4;
public static const RETURNINDEXEDARRAY:uint = 8;
public static const NUMERIC:uint = 16;
private static const DELETED:Object = new Object ();
var vector:Vector.<Object>;
public function Array (numElements:int = 0)
{
vector = new Vector.<Object> (numElements);
}
public function Array (...rest)
{
vector = new Vector.<Object> (rest);
}
public function get length ():uint
{
return vector.length;
}
public function set length (value:uint):void
{
vector.length = value;
}
// TODO:
//public function push (...rest):uint
//{
// throw new System.NotImplementedException ();
// // TODO: return vector.push (rest);
//}
public function splice (startIndex:int = 0, deleteCount:uint = 4294967295 /*uint.MAX_VALUE*/, ...values):Array
{
throw new System.NotImplementedException ();
}
//
// Extensions to AS3
//
public function push (value:Object):uint
{
return vector.push (value);
}
internal function setValue (index:uint, value:Object):void
{
if (index < 0)
throw new System.NotImplementedException (); // TODO: Allowed but how to handle
//
// Assigning out of array range
//
if (index >= vector.length) {
// while (length < index - 1)
// list.Add (default (T)); // TODO: Need better "invisible" value, perhaps DELETED would work ?
vector.push (value);
return;
}
vector.setValue (index, value);
}
internal function getValue (index:uint):*
{
if (index < 0 || index > vector.length)
return undefined;
return vector.getValue (index);
}
internal function deleteValue (index:uint):void
{
setValue (index, DELETED);
}
}
}
@@ -0,0 +1,56 @@
//
// AssemblyInfo.cs
//
// Authors:
// Marek Safar ([email protected])
//
// Copyright 2013 Xamarin Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Reflection;
using System.Resources;
using System.Security;
using System.Security.Permissions;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about the assembly
[assembly: AssemblyTitle ("PlayScript.Core.dll")]
[assembly: AssemblyDescription ("PlayScript.Core.dll")]
[assembly: AssemblyDefaultAlias ("PlayScript.Core.dll")]
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (false)]
[assembly: ComVisible (false)]
+30
View File
@@ -0,0 +1,30 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
public static class Boolean
{
public static string toString(this bool b) {
return b ? "true" : "false";
}
public static bool valueOf(this bool b) {
return b;
}
}
}
+41
View File
@@ -0,0 +1,41 @@
//
// Date.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
package {
public final dynamic class Date
{
public function Date (yearOrTimevalue:Object = null, month:Number = 1, date:Number = 1, hour:Number = 0, minute:Number = 0, second:Number = 0, millisecond:Number = 0)
{
}
public static function UTC (year:Number, month:Number, date:Number = 1, hour:Number = 0, minute:Number = 0, second:Number = 0, millisecond:Number = 0):Number
{
return 0;
}
}
}
@@ -0,0 +1,26 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class DefinitionError extends Error {
public function DefinitionError(message:String = "") {
super(message);
}
}
}
@@ -0,0 +1,29 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
public class DeprecatedAttribute : Attribute
{
public DeprecatedAttribute()
{
}
public string message {get;set;}
}
}
@@ -0,0 +1,38 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
public class EmbedAttribute : Attribute
{
public string source { get; set; }
public string mimeType { get; set; }
public string embedAsCFF { get; set; }
public string fontFamily { get; set; }
public string symbol { get; set; }
public EmbedAttribute (string _source = null)
{
source = _source;
}
}
}
+106
View File
@@ -0,0 +1,106 @@
//
// Error.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
package {
public dynamic class Error extends System.Exception
{
private var error_id : int;
public function Error (message:String = "", id:int = 0)
{
super (message);
error_id = id;
}
public function get errorID () : int
{
return error_id;
}
public function get message () : String
{
return Message;
}
public function set message (value:String): void
{
throw new System.NotImplementedException();
}
public function get name () : String
{
return GetType().Name;
}
public function set name (value:String): void
{
throw new System.NotImplementedException();
}
public function getStackTrace () : String
{
return StackTrace;
}
public static function getErrorMessage (index:int) : String
{
// TODO: Finish all error messages
var msg:String;
switch (index) {
case 1000:
msg = "The system is out of memory.";
break;
case 1001:
msg = "The method {0} is not implemented.";
break;
case 1002:
msg = "Number.toPrecision has a range of 1 to 21. Number.toFixed and Number.toExponential have a range of 0 to 20. Specified value is not within expected range.";
break;
case 1007:
msg = "Instantiation attempted on a non-constructor.";
break;
case 1009:
msg = "Cannot access a property or method of a null object reference.";
break;
}
if (msg == null)
return System.String.Format ("#{0}", index);
return System.String.Format ("#{0}: {1}", index, msg);
}
public static function throwError (type:Class, index:uint, ...rest) : *
{
throw new System.NotImplementedException ();
}
}
}
@@ -0,0 +1,31 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
public class EventAttribute : Attribute
{
public string name { get; set; }
public string type { get; set; }
public EventAttribute ()
{
}
}
}
+54
View File
@@ -0,0 +1,54 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
using System.Collections;
namespace _root
{
public static class Extensions
{
// public static string toString(this object o)
// {
// return o.ToString ();
// }
public static string toLocaleString(this object o)
{
return o.ToString ();
}
public static bool hasOwnProperty(this object o, string name)
{
var t = o.GetType ();
return t.GetProperty(name) != null || t.GetField(name) != null;
}
public static string toString(this uint o, int radix = 10)
{
return Convert.ToString (o, radix);
}
//
// IList extensions (for arrays, etc).
//
// public static int get_length(this IList list)
// {
// return list.Count;
// }
}
}
@@ -0,0 +1,52 @@
//
// FunctionExtensions.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace _root {
public static class FunctionExtensions {
public static dynamic apply (this Delegate d, object thisArg = null, Array argArray = null)
{
return d.DynamicInvoke (argArray != null ? argArray.ToArray() : null);
}
public static dynamic call (this Delegate d, object thisArg = null, params object[] rest)
{
return d.DynamicInvoke (rest);
}
// this returns the number of arguments to the delegate method
//public static int get_length(this Delegate d) {
// return d.Method.GetParameters().Length;
//}
}
}
+29
View File
@@ -0,0 +1,29 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class JSON {
public static function parse(text:String, reviver:Function = null):Object {
throw new System.NotImplementedException();
}
public static function stringify(value:Object, replacer:* = null, space:* = null):String {
throw new System.NotImplementedException();
}
}
}
+12
View File
@@ -0,0 +1,12 @@
thisdir = class/PlayScript.Core
include ../../build/rules.make
LIBRARY = PlayScript.Core.dll
LIBRARY_SNK = ../mono.snk
LIBRARY_PACKAGE = none
LIB_MCS_FLAGS = -d:DYNAMIC_SUPPORT -keyfile:$(LIBRARY_SNK) -delaysign -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll -r:Mono.CSharp.dll
NO_TEST = yes
include ../../build/library.make
+127
View File
@@ -0,0 +1,127 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class Math {
//
// Constants
//
public static const E : Number = 2.71828182845905;
public static const LN10 : Number = 2.302585092994046;
public static const LN2 : Number = 0.6931471805599453;
public static const LOG10E : Number = 0.4342944819032518;
public static const LOG2E : Number = 1.442695040888963387;
public static const PI : Number = 3.141592653589793;
public static const SQRT1_2 : Number = 0.7071067811865476;
public static const SQRT2 : Number = 1.4142135623730951;
//
// Methods
//
public static function abs(val:Number):Number {
return System.Math.Abs(val);
}
public static function acos(val:Number):Number {
return System.Math.Acos(val);
}
public static function asin(val:Number):Number {
return System.Math.Asin(val);
}
public static function atan(val:Number):Number {
return System.Math.Atan(val);
}
public static function atan2(y:Number, x:Number):Number {
return System.Math.Atan2(y, x);
}
public static function ceil(val:Number):Number {
return System.Math.Ceiling(val);
}
public static function cos(angleRadians:Number):Number {
return System.Math.Cos(angleRadians);
}
public static function exp(val:Number):Number {
return System.Math.Exp(val);
}
public static function floor(val:Number):Number {
return System.Math.Floor(val);
}
public static function log(val:Number):Number {
return System.Math.Log(val);
}
public static function max(val1:Number, val2:Number):Number {
return System.Math.Max(val1, val2);
}
public static function max(val1:Number, val2:Number, ... rest):Number {
throw new System.NotImplementedException();
}
public static function min(val1:Number, val2:Number):Number {
return System.Math.Min(val1, val2);
}
public static function min(val1:Number, val2:Number, ... rest):Number {
throw new System.NotImplementedException();
}
public static function pow(base:Number, pow:Number):Number {
return System.Math.Pow(base, pow);
}
private static var sRandom:System.Random = new System.Random();
public static function random():Number {
return sRandom.NextDouble();
}
public static function round(val:Number):Number {
return System.Math.Round(val);
}
public static function sin(angleRadians:Number):Number {
return System.Math.Sin(angleRadians);
}
public static function sqrt(val:Number):Number {
return System.Math.Sqrt(val);
}
public static function tan(angleRadians:Number):Number {
return System.Math.Tan(angleRadians);
}
}
}
+61
View File
@@ -0,0 +1,61 @@
//
// Namespace.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public final class Namespace
{
private var prefix_value:String;
private var uri_value:String;
public function Namespace (prefix:*=null, uri:*=null)
{
prefix_value = prefix;
uri_value = uri;
}
//
// Properties
//
public function get prefix () : String
{
return prefix_value;
}
public function get uri () : String
{
return uri_value;
}
//
// Methods
//
public function toString ():String
{
throw new System.NotImplementedException();
}
public function valueOf ():Object
{
throw new System.NotImplementedException();
}
}
}
+63
View File
@@ -0,0 +1,63 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
namespace _root {
public static class Number {
//
// Extension Methods
//
public static string toExponential(this double d, uint fractionDigits) {
throw new System.NotImplementedException();
}
public static string toFixed(this double d, uint fractionDigits) {
return d.ToString ( "F" + fractionDigits.ToString() );
}
public static string toPrecision(this double d, uint precision) {
throw new System.NotImplementedException();
}
public static string toString(this double d) {
return d.ToString();
}
public static string toString(this double d, double radix) {
throw new System.NotImplementedException();
}
public static double valueOf(this double d) {
return d;
}
//
// Constants
//
public const double MAX_VALUE = System.Double.MaxValue;
public const double MIN_VALUE = System.Double.MinValue;
public const double @NaN = System.Double.NaN;
public const double NEGATIVE_INFINITY = System.Double.NegativeInfinity;
public const double POSITIVE_INFINITY = System.Double.PositiveInfinity;
}
}
@@ -0,0 +1,47 @@
../../build/common/Consts.cs
./Assembly/AssemblyInfo.cs
./Array.play
./Boolean.cs
./Date.play
./DeprecatedAttribute.cs
./EmbedAttribute.cs
./EventAttribute.cs
./Extensions.cs
./FunctionExtensions.cs
./functions.cs
./int.cs
./Number.cs
./StringExtensions.cs
./ArgumentError.play
./DefinitionError.play
./Error.play
./JSON.play
./Math.play
./Namespace.play
./QName.play
./RangeError.play
./ReferenceError.play
./RegExp.play
./SecurityError.play
./SyntaxError.play
./SWFAttribute.cs
./toplevel.play
./TypeError.play
./URIError.play
./Vector.cs
./VerifyError.play
./XML.play
./XMLList.play
./PlayScript.Runtime/BinaryOperator.cs
./PlayScript.Runtime/Binder.cs
./PlayScript.Runtime/DefaultObjectContext.cs
./PlayScript.Runtime/IsPropertyBinder.cs
./PlayScript.Runtime/PlayScriptGetMemberBinder.cs
./PlayScript.Runtime/Operations.cs
./PlayScript.Runtime/Undefined.cs
./PlayScript.Runtime.CompilerServices/ConstantFieldAttribute.cs
./PlayScript.Runtime.CompilerServices/DynamicClassAttribute.cs
./PlayScript.Runtime.CompilerServices/NamespaceFieldAttribute.cs
./PlayScript.Runtime.CompilerServices/PlayScriptAttribute.cs
./PlayScript.Runtime.CompilerServices/RestArrayParameterAttribute.cs
@@ -0,0 +1,47 @@
//
// ConstantFieldAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace PlayScript.Runtime.CompilerServices
{
[AttributeUsage (AttributeTargets.Field)]
public sealed class ConstantFieldAttribute : Attribute
{
public ConstantFieldAttribute ()
{
}
public ConstantFieldAttribute (object value)
{
Value = value;
}
public object Value { get; private set; }
}
}
@@ -0,0 +1,37 @@
//
// DynamicClassAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace PlayScript.Runtime.CompilerServices
{
[AttributeUsage (AttributeTargets.Class)]
public sealed class DynamicClassAttribute : Attribute
{
}
}
@@ -0,0 +1,43 @@
//
// NamespaceFieldAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace PlayScript.Runtime.CompilerServices
{
[AttributeUsage (AttributeTargets.Field)]
public sealed class NamespaceFieldAttribute : Attribute
{
public NamespaceFieldAttribute (string uri)
{
Uri = uri;
}
public string Uri { get; private set; }
}
}
@@ -0,0 +1,37 @@
//
// PlayScriptAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace PlayScript.Runtime.CompilerServices
{
[AttributeUsage (AttributeTargets.Class)]
public sealed class PlayScriptAttribute : Attribute
{
}
}
@@ -0,0 +1,37 @@
//
// RestArrayAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace PlayScript.Runtime.CompilerServices
{
[AttributeUsage (AttributeTargets.Parameter)]
public sealed class RestArrayParameterAttribute : Attribute
{
}
}
@@ -0,0 +1,62 @@
//
// BinaryOperator.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
namespace PlayScript.Runtime
{
public enum BinaryOperator
{
Multiply = 1,
Division = 2,
Modulus = 3,
Addition = 4,
Subtraction = 5,
LeftShift = 10,
RightShift = 11,
UnsignedRightShift = 12,
LessThan = 20,
GreaterThan = 21,
LessThanOrEqual = 22,
GreaterThanOrEqual = 23,
Equality = 24,
Inequality = 25,
BitwiseAnd = 30,
ExclusiveOr = 31,
BitwiseOr = 32,
LogicalAnd = 40,
LogicalOr = 41,
StrictEquality = 50 | StrictMask,
StrictInequality = 51 | StrictMask,
StrictMask = 1 >> 16
}
}
@@ -0,0 +1,286 @@
//
// Binder.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Runtime.CompilerServices;
using System.Collections.Generic;
using System.Collections.Concurrent;
using Microsoft.CSharp.RuntimeBinder;
using System.Globalization;
namespace PlayScript.Runtime
{
public static class Binder
{
static readonly ConditionalWeakTable<object, ConcurrentDictionary<string, object>> dynamic_classes = new ConditionalWeakTable<object, ConcurrentDictionary<string, object>> ();
public static dynamic GetMember (object instance, Type context, object name)
{
if (instance == null)
throw GetNullObjectReferenceException ();
//
// Use index getter when name can be converted to number on array instances
//
var array = instance as _root.Array;
if (array != null) {
var index = GetArrayIndex (name);
if (index != null) {
return array.getValue (index.Value);
}
}
var sname = GetName (name);
ConcurrentDictionary<string, object> members;
if (dynamic_classes.TryGetValue (instance, out members)) {
object value;
if (members.TryGetValue (sname, out value))
return value;
}
var binder = Microsoft.CSharp.RuntimeBinder.Binder.GetMember (CSharpBinderFlags.None, sname, context, new[] { CSharpArgumentInfo.Create (CSharpArgumentInfoFlags.None, null) });
var callsite = CallSite<Func<CallSite, object, object>>.Create (binder);
// TODO: Add caching to avoid expensive Resolve
return callsite.Target (callsite, instance);
}
public static CallSiteBinder GetMember (string name, Type context, DefaultObjectContext objectContext)
{
return new PlayScriptGetMemberBinder (name, context, objectContext);
}
public static void SetMember (object instance, Type context, object name, object value)
{
if (instance == null)
throw GetNullObjectReferenceException ();
//
// Use index setter when name can be converted to number on array instances
//
var array = instance as _root.Array;
if (array != null) {
var index = GetArrayIndex (name);
if (index != null) {
array.setValue (index.Value, value);
return;
}
}
var sname = GetName (name);
var binder = Microsoft.CSharp.RuntimeBinder.Binder.SetMember (CSharpBinderFlags.None, sname, context,
new[] { CSharpArgumentInfo.Create (CSharpArgumentInfoFlags.None, null), CSharpArgumentInfo.Create (CSharpArgumentInfoFlags.None, null) });
var callsite = CallSite<Func<CallSite, object, object, object>>.Create (binder);
// TODO: Better handling
try {
// TODO: Add caching to avoid expensive Resolve
callsite.Target (callsite, instance, value);
} catch (RuntimeBinderException) {
var members = dynamic_classes.GetOrCreateValue (instance);
// TODO: Not thread safe
members[sname] = value;
}
}
public static IEnumerable<string> GetKeys (object instance)
{
if (instance == null)
return new string [0];
//
// Array's are different
//
var array = instance as _root.Array;
if (array != null) {
return CreateArrayKeysIterator (array.length);
}
ConcurrentDictionary<string, object> members;
if (dynamic_classes.TryGetValue (instance, out members)) {
return CreateMemberKeysIterator (members.Keys);
}
return new string [0];
}
static IEnumerable<string> CreateArrayKeysIterator (uint length)
{
for (uint i = 0; i < length; ++i)
yield return i.ToString (CultureInfo.InvariantCulture);
}
static IEnumerable<string> CreateMemberKeysIterator (ICollection<string> keys)
{
foreach (var key in keys)
yield return key;
}
public static IEnumerable<dynamic> GetValues (object instance)
{
if (instance == null)
return new dynamic [0];
//
// Array's are different
//
var array = instance as _root.Array;
if (array != null) {
return CreateArrayValuesIterator (array);
}
ConcurrentDictionary<string, object> members;
if (dynamic_classes.TryGetValue (instance, out members)) {
return CreateMemberValuesIterator (members.Values);
}
return new dynamic [0];
}
static IEnumerable<object> CreateArrayValuesIterator (_root.Array array)
{
for (uint i = 0; i < array.length; ++i)
yield return array [i];
}
static IEnumerable<object> CreateMemberValuesIterator (ICollection<object> values)
{
foreach (var value in values)
yield return value;
}
public static bool HasProperty (object instance, Type context, object property)
{
if (instance == null)
throw GetNullObjectReferenceException ();
//
// Calling in operator on Array instance means something different
//
var array = instance as _root.Array;
if (array != null) {
var index = GetArrayIndex (property);
if (index == null)
return false;
return array.length > index;
}
var type = instance as Type;
var sname = GetName (property);
bool static_only;
//
// It's null when it's not static
//
if (type == null) {
ConcurrentDictionary<string, object> members;
if (dynamic_classes.TryGetValue (instance, out members) && members.ContainsKey (sname)) {
return true;
}
type = instance.GetType ();
static_only = false;
} else {
static_only = true;
}
var binder = new IsPropertyBinder (sname, context, static_only);
var callsite = CallSite<Func<CallSite, Type, bool>>.Create (binder);
// TODO: Better handling
try {
// TODO: Add caching to avoid expensive Resolve
return callsite.Target (callsite, type);
} catch (RuntimeBinderException) {
throw;
}
}
public static bool DeleteProperty (object instance, object property)
{
//
// delete operator on Array instances
//
var array = instance as _root.Array;
if (array != null) {
var index = GetArrayIndex (property);
if (index != null) {
array.deleteValue (index.Value);
}
return true;
}
ConcurrentDictionary<string, object> members;
if (dynamic_classes.TryGetValue (instance, out members)) {
var sname = GetName (property);
object value;
members.TryRemove (sname, out value);
}
return true;
}
public static dynamic DelegateInvoke (Delegate instance, params object[] args)
{
if (instance == null)
throw new NotImplementedException ();
return instance.DynamicInvoke (args);
}
static uint? GetArrayIndex (object value)
{
try {
return Convert.ToUInt32 (value);
} catch {
return null;
}
}
static string GetName (object name)
{
// TODO: Will be special token for null key enough?
if (name == null)
throw new NotImplementedException ("null name");
return name.ToString ();
}
static Exception GetNullObjectReferenceException ()
{
return new _root.Error ("Cannot access a property or method of a null object reference.", 1009);
}
}
}
@@ -0,0 +1,74 @@
//
// DefaultObjectContext.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System.Collections.Generic;
using Microsoft.CSharp.RuntimeBinder;
using Compiler = Mono.CSharp;
using PSCompiler = Mono.PlayScript;
namespace PlayScript.Runtime
{
public class DefaultObjectContext
{
readonly Stack<Compiler.Expression> stack;
private DefaultObjectContext ()
{
stack = new Stack<Compiler.Expression> ();
}
internal Stack<Compiler.Expression> Context {
get {
return stack;
}
}
public static DefaultObjectContext Create ()
{
return new DefaultObjectContext ();
}
// TODO: Will likely need extra argument for something similar to CSharpArgumentInfoFlags to correctly
// recreate source expression
public void Register (object instance)
{
if (instance == null)
throw new _root.TypeError (_root.Error.getErrorMessage (1009), 1009);
var ctx = DynamicContext.Create ();
var expr = new PSCompiler.ObjectContextRuntimeExpression (ctx.ImportType (instance.GetType ()));
stack.Push (expr);
}
public void Unregister ()
{
stack.Pop ();
}
}
}
@@ -0,0 +1,77 @@
//
// IsPropertyBinder.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Dynamic;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CSharp.RuntimeBinder;
using Compiler = Mono.CSharp;
namespace PlayScript.Runtime
{
class IsPropertyBinder : DynamicMetaObjectBinder
{
Type callingContext;
string name;
bool static_only;
public IsPropertyBinder (string name, Type callingContext, bool staticOnly)
{
this.name = name;
this.callingContext = callingContext;
this.static_only = staticOnly;
}
public override DynamicMetaObject Bind (DynamicMetaObject target, DynamicMetaObject[] args)
{
var ctx = DynamicContext.Create ();
var context_type = ctx.ImportType (callingContext);
var queried_type = ctx.ImportType ((Type) target.Value);
var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, context_type), 0);
var expr = Compiler.Expression.MemberLookup (rc, false, queried_type,
name, 0, Compiler.Expression.MemberLookupRestrictions.ExactArity, Compiler.Location.Null);
var pe = expr as Compiler.PropertyExpr;
var result = pe != null && pe.IsStatic == static_only;
var binder = new CSharpBinder (
this, new Compiler.BoolConstant (ctx.CompilerContext.BuiltinTypes, result, Compiler.Location.Null), null);
binder.AddRestrictions (target);
return binder.Bind (ctx, callingContext);
}
public override Type ReturnType {
get {
return typeof (bool);
}
}
}
}
@@ -0,0 +1,193 @@
//
// Operations.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace PlayScript.Runtime
{
public static class Operations
{
public static bool Comparison (BinaryOperator binaryOperator, object left, object right)
{
if (right is int)
return Comparison (binaryOperator, left, (int) right);
if (right is string)
return Comparison (binaryOperator, left, (string) right);
// TODO: uint, string, double, etc
return false;
}
public static bool Comparison (BinaryOperator binaryOperator, object left, int right)
{
if (left is int) {
var l = (int) left;
switch (binaryOperator) {
case BinaryOperator.Equality:
case BinaryOperator.StrictEquality:
return l == right;
case BinaryOperator.Inequality:
return l != right;
case BinaryOperator.GreaterThan:
return l > right;
case BinaryOperator.GreaterThanOrEqual:
return l >= right;
case BinaryOperator.LessThan:
return l < right;
case BinaryOperator.LessThanOrEqual:
return l <= right;
default:
throw new NotImplementedException (binaryOperator.ToString ());
}
}
if ((binaryOperator & BinaryOperator.StrictMask) != 0)
return binaryOperator == BinaryOperator.StrictInequality;
// TODO: uint, string, double, etc
return false;
}
public static bool Comparison (BinaryOperator binaryOperator, int left, object right)
{
if (right is int) {
var r = (int) right;
switch (binaryOperator) {
case BinaryOperator.Equality:
case BinaryOperator.StrictEquality:
return left == r;
case BinaryOperator.Inequality:
case BinaryOperator.StrictInequality:
return left != r;
case BinaryOperator.GreaterThan:
return left > r;
case BinaryOperator.GreaterThanOrEqual:
return left >= r;
case BinaryOperator.LessThan:
return left < r;
case BinaryOperator.LessThanOrEqual:
return left <= r;
default:
throw new NotImplementedException (binaryOperator.ToString ());
}
}
if ((binaryOperator & BinaryOperator.StrictMask) != 0)
return binaryOperator == BinaryOperator.StrictInequality;
// TODO: uint, string, double, etc
return false;
}
public static bool Comparison (BinaryOperator binaryOperator, object left, string right)
{
if (right is string) {
var l = (string) left;
switch (binaryOperator) {
case BinaryOperator.Equality:
case BinaryOperator.StrictEquality:
return l == right;
case BinaryOperator.Inequality:
case BinaryOperator.StrictInequality:
return l != right;
/* TODO: rules base on char comparison but how does it work with unicode
case BinaryOperator.GreaterThan:
return l > right;
case BinaryOperator.GreaterThanOrEqual:
return l >= right;
case BinaryOperator.LessThan:
return l < right;
case BinaryOperator.LessThanOrEqual:
return l <= right;
default:
throw new NotImplementedException (binaryOperator.ToString ());
*/
}
}
if ((binaryOperator & BinaryOperator.StrictMask) != 0)
return binaryOperator == BinaryOperator.StrictInequality;
// TODO: uint, string, double, etc
return false;
}
public static Type ClassOf (object instance)
{
var type = instance as Type;
if (type == null)
throw new _root.TypeError (_root.Error.getErrorMessage (1007), 1007);
return type;
}
public static bool IsOfType<T> (ref T instance, Type expectedType)
{
if (expectedType == null)
throw new _root.TypeError (_root.Error.getErrorMessage (1009), 1009);
if (instance == null)
return false;
return expectedType.IsAssignableFrom (instance.GetType ());
}
public static string TypeOf (object instance)
{
if (instance == null)
return "object";
if (instance is string)
return "string";
if (instance is int || instance is uint || instance is double)
return "number";
if (instance is bool)
return "boolean";
// TODO: Wrong, it has to be of a special type
if (instance == Undefined.Value)
return "undefined";
// TODO: Wrong, it has to be of a special type
if (instance is _root.XML || instance is _root.XMLList)
return "xml";
if (instance is Delegate)
return "function";
return "object";
}
}
}
@@ -0,0 +1,69 @@
//
// PlayScriptGetMemberBinder.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Dynamic;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CSharp.RuntimeBinder;
using Compiler = Mono.CSharp;
using PSCompiler = Mono.PlayScript;
namespace PlayScript.Runtime
{
class PlayScriptGetMemberBinder : GetMemberBinder
{
Type callingContext;
DefaultObjectContext objectContext;
public PlayScriptGetMemberBinder (string name, Type callingContext, DefaultObjectContext objectContext)
: base (name, false)
{
this.callingContext = callingContext;
this.objectContext = objectContext;
}
public override DynamicMetaObject FallbackGetMember (DynamicMetaObject target, DynamicMetaObject errorSuggestion)
{
var ctx = DynamicContext.Create ();
Compiler.Expression expr = new PSCompiler.SimpleName (Name, Compiler.Location.Null);
expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
var binder = new CSharpBinder (this, expr, errorSuggestion);
binder.AddRestrictions (target);
// TODO: RuntimeBinderContext is not enough, it won't search global extension methods for builtin types
var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, callingContext), binder.ResolveOptions);
rc.DefaultObjectContext = new PSCompiler.WithContext (objectContext.Context);
return binder.Bind (rc);
}
}
}
@@ -0,0 +1,35 @@
//
// Undefined.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
namespace PlayScript.Runtime
{
public static class Undefined
{
public static readonly object Value = new object ();
}
}
+61
View File
@@ -0,0 +1,61 @@
//
// QName.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
package {
public final class QName
{
private var mUri:String;
private var mLocalName:String;
public function QName(@namespace:String=null, name:String=null)
{
mUri = uri;
mLocalName = localName;
}
public function get localName () : String
{
return mLocalName;
}
public function get uri () : String
{
return mUri;
}
public function toString():String {
throw new System.NotImplementedException();
}
public function valueOf():Object {
throw new System.NotImplementedException();
}
}
}
+45
View File
@@ -0,0 +1,45 @@
//
// RangeError.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
package {
public dynamic class RangeError extends Error {
public function RangeError (message:String = "", id:int = 0)
{
super (message, id);
}
internal static function CreateIndexError (index:uint, range:uint):RangeError
{
return new RangeError (System.String.Format ("The index {0} is out of range {1}.", index, range), 1125);
}
}
}
@@ -0,0 +1,25 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class ReferenceError extends Error {
public function ReferenceError(message:String = "") {
super(message);
}
}
}
+164
View File
@@ -0,0 +1,164 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
import System.*;
import System.Text.RegularExpressions.*;
public class RegExp {
//
// Properties
//
/*
public property dotall : Boolean {
get { return mDoTail;}
}
public property extended : Boolean {
get { return mExtended;}
}
public property global : Boolean {
get { return mGlobal;}
}
public property ignoreCase : Boolean {
get { return (mRegex.Options & RegexOptions.IgnoreCase) != 0;}
}
public property lastIndex : Number {
get { throw new NotImplementedException();}
}
public property multiline : Boolean {
get { return (mRegex.Options & RegexOptions.Multiline) != 0;}
}
public property source : String {
get { return mSource;}
}
*/
//
// Methods
//
public function RegExp(re:String, flags:String) {
var options:RegexOptions = RegexOptions.None;
for (var i:int=0; i < flags.Length; i++) {
switch (flags.charAt(i)) {
case "m":
options |= RegexOptions.Multiline;
break;
case "i":
options |= RegexOptions.IgnoreCase;
break;
case "g":
mGlobal = true;
break;
case "x":
mExtended = true;
break;
case "s":
mDoTail = true;
break;
default:
throw new NotImplementedException();
}
}
mSource = re;
mRegex = new Regex(re, options);
}
public function exec(str:String):Object {
var m = mRegex.Match(str);
if (m.Success) {
var a:Array = [];
// a.push(m.Value);
for each (var g:Group in m.Groups) {
a.push(g.Value);
}
return a;
} else
{
return null;
}
}
public function test(str:String):Boolean {
throw new NotImplementedException();
}
public function replace(str:String, replaceWith:String):String {
return mRegex.Replace(str, replaceWith);
}
public function search(str:String):int {
var m = mRegex.Match(str);
if (!m.Success) {
return -1;
}
return m.Index;
}
public function match(str:String):Array {
var a:Array = null;
var m = mRegex.Match(str);
while (m.Success) {
if (a == null) a = new Array();
a.push( m.Value );
m = m.NextMatch();
}
return a;
}
public function split(str:String):Array
{
var a:Array = new Array();
var lastIndex:int = 0;
var m = mRegex.Match(str);
while (m.Success) {
// get everything before the match
var before:String = str.Substring(lastIndex, m.Index - lastIndex);
a.push(before);
// push all matching groups
for (var i:int = 1; i < m.Groups.Count; i++)
{
a.push(m.Groups[i].Value);
}
// set last index
lastIndex = m.Index + m.Length;
// next match
m = m.NextMatch();
}
// push everything after last match
var end:String = str.Substring(lastIndex, str.Length - lastIndex);
a.push(end);
return a;
}
var mRegex:Regex;
var mSource:String;
var mGlobal:Boolean;
var mExtended:Boolean;
var mDoTail:Boolean;
}
}
+33
View File
@@ -0,0 +1,33 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false)]
public class SWFAttribute : Attribute
{
public object width { get; set; }
public object height { get; set; }
public object frameRate { get; set; }
public object backgroundColor { get; set; }
public object quality {get;set;}
public SWFAttribute ()
{
}
}
}
@@ -0,0 +1,26 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class SecurityError extends Error {
public function SecurityError(message:String = "") {
super(message);
}
}
}
@@ -0,0 +1,186 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
using System.Text;
namespace _root
{
public static class StringExtensions
{
public static int get_length(this String s) {
return s.Length;
}
public static String charAt (this String s, double index = 0) {
return s[ (int)index ].ToString();
}
public static int charCodeAt(this String s, double index) {
return s[(int)index];
}
public static String concat(this String s, params object[] args) {
foreach (object arg in args)
{
s += arg.ToString();
}
return s;
}
private static char objectToChar(object o)
{
if (o is int) {
return (char)(int)o;
} else if (o is uint) {
return (char)(uint)o;
} else if (o is char) {
return (char)o;
} else {
throw new NotImplementedException();
}
}
public static String fromCharCode (params object[] charCodes)
{
if (charCodes.Length == 1)
{
return new String(objectToChar(charCodes[0]), 1);
}
else
{
var chars = new char[charCodes.Length];
for (int i=0; i < charCodes.Length; i++) {
chars[i] = objectToChar(charCodes[i]);
}
return new String(chars);
}
}
public static int indexOf(this String s, String val, double startIndex = 0) {
if (s == null) return -1;
return s.IndexOf(val, (int)startIndex);
}
public static int lastIndexOf(this String s, String val, double startIndex = 0x7FFFFFFF) {
throw new NotImplementedException();
}
public static int localeCompare(this String s, String other, params object[] values) {
throw new NotImplementedException();
}
public static Array match(this String s, object pattern) {
if (pattern is RegExp) {
// pattern is a regexp
var re = pattern as RegExp;
return re.match(s);
} else {
// pattern is a String or other object
throw new NotImplementedException();
}
}
public static String replace (this String s, object pattern, object repl)
{
if (pattern is RegExp) {
// pattern is a regexp
var re = pattern as RegExp;
return re.replace(s, repl.ToString());
} else {
// pattern is a String or other object
return s.Replace(pattern.ToString (), repl.ToString());
}
}
public static int search(this String s, object pattern) {
if (pattern is RegExp) {
// pattern is a regexp
var re = pattern as RegExp;
return re.search(s);
} else {
// pattern is a String or other object
return s.IndexOf(pattern.ToString ());
}
}
public static String slice(this String s) {
throw new NotImplementedException();
}
public static String slice(this String s, int startIndex) {
return s.Substring(startIndex);
}
public static String slice(this String s, int startIndex, int endIndex) {
return s.Substring(startIndex, endIndex - startIndex);
}
public static Array split (this String s, object delimiter, int limit = 0x7fffffff)
{
if (limit != 0x7fffffff) {
throw new NotImplementedException ();
}
if (delimiter is RegExp) {
var re = delimiter as RegExp;
return re.split(s);
} else if (delimiter is String) {
return new Array( s.Split(new String[] {(String)delimiter}, StringSplitOptions.None ));
} else {
throw new NotImplementedException ();
}
}
public static String substr (this String s, double startIndex = 0, double len = 0x7fffffff) {
if (len == 0x7fffffff) {
return s.Substring((int)startIndex);
} else {
// TODO: should this throw or be silent if length exceeded?
return s.Substring((int)startIndex, (int)len);
}
}
public static String substring (this String s, double startIndex = 0, double endIndex = 0x7fffffff) {
if (endIndex == 0x7fffffff) {
return s.Substring((int)startIndex);
} else {
// TODO: should this throw or be silent if length exceeded?
return s.Substring((int)startIndex, (int)endIndex - (int)startIndex);
}
}
public static String toLocaleLowerCase(this String s) {
throw new NotImplementedException();
}
public static String toLocaleUpperCase(this String s) {
throw new NotImplementedException();
}
public static String toLowerCase(this String s) {
return s.ToLowerInvariant();
}
public static String toUpperCase(this String s) {
return s.ToUpperInvariant();
}
public static String valueOf(this String s) {
return s;
}
}
}
@@ -0,0 +1,26 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class SyntaxError extends Error {
public function SyntaxError(message:String = "") {
super(message);
}
}
}
+39
View File
@@ -0,0 +1,39 @@
//
// TypeError.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
package {
public dynamic class TypeError extends Error {
public function TypeError (message:String = "", id:int = 0)
{
super (message, id);
}
}
}
+26
View File
@@ -0,0 +1,26 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class URIError extends Error {
public function URIError(message:String = "") {
super(message);
}
}
}
+123
View File
@@ -0,0 +1,123 @@
//
// Vector.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Collections.Generic;
using PlayScript.Runtime.CompilerServices;
namespace _root
{
[DynamicClass]
public class Vector<T>
{
readonly List<T> list;
public Vector (int length = 0, bool @fixed = false)
{
list = new List<T> (length);
this.@fixed = @fixed;
}
public Vector (params T[] values)
{
list = new List<T> (values);
}
private Vector (List<T> list)
{
this.list = list;
}
public bool @fixed { get; set; }
public uint length {
get {
return (uint) list.Count;
}
set {
throw new NotImplementedException ();
}
}
public Vector<T> concat ([RestArrayParameter] Array args)
{
throw new NotImplementedException ();
}
public Vector<T> concat (params T[] args)
{
var res = new List<T> (list);
res.AddRange (args);
return new Vector<T> (res);
}
public int indexOf (T searchElement, int fromIndex)
{
return list.IndexOf (searchElement, fromIndex);
}
public int lastIndexOf (T searchElement, int fromIndex = 0x7fffffff)
{
return list.LastIndexOf (searchElement, fromIndex);
}
public uint push (T value)
{
list.Add (value);
return length;
}
public uint unshift ([RestArrayParameter] Array args)
{
throw new NotImplementedException ();
}
public uint unshift (params T[] args)
{
list.InsertRange (0, args);
return length;
}
internal void setValue (uint index, T value)
{
if (index < 0 || index >= length)
throw RangeError.CreateIndexError (index, length);
list [(int) index] = value;
}
internal T getValue (uint index)
{
if (index < 0 || index >= length)
throw RangeError.CreateIndexError (index, length);
return list [(int) index];
}
}
}
@@ -0,0 +1,27 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public class VerifyError extends Error {
public function VerifyError(message:String = "") {
super(message);
}
}
}
+283
View File
@@ -0,0 +1,283 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
import System.*;
import System.Xml.*;
public class XML {
var mElement:XmlElement;
//
// Properties
//
/*
public static property ignoreComments : Boolean {
get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); }
}
public static property ignoreProcessingInstructions : Boolean {
get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); }
}
public static property ignoreWhitespace : Boolean {
get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); }
}
public static property prettyIndent : int {
get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); }
}
public static property prettyPrinting : Boolean {
get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); }
}
*/
//
// Methods
//
public function XML(value:Object) {
/*
if (value is XmlElement)
{
mElement = value as XmlElement;
} else if (value is flash.utils.ByteArray)
{
var ba:flash.utils.ByteArray = value as flash.utils.ByteArray;
// read string from byte array
ba.position = 0;
var xmlString:String = ba.readAllUTF();
// parse xml document from string
var doc:XmlDocument = new XmlDocument();
doc.LoadXml(xmlString);
mElement = doc.DocumentElement;
} else if (value is String)
{
// parse xml document from string
var doc:XmlDocument = new XmlDocument();
doc.LoadXml(value as String);
mElement = doc.DocumentElement;
}
else
{
throw new System.NotImplementedException();
}
*/
}
public function XML(value:XmlNode)
{
// TODO: mElement = value;
}
public function addNamespace(ns:Object):XML {
throw new System.NotImplementedException();
}
public function appendChild(child:Object):XML {
throw new System.NotImplementedException();
}
/*
public function attribute(attributeName:String):XMLList {
throw new System.NotImplementedException();
}*/
public function attribute(attributeName:String):String {
return mElement.HasAttribute(attributeName) ? mElement.GetAttribute(attributeName) : null;
}
public function attributes():XMLList {
throw new System.NotImplementedException();
}
public function child(propertyName:Object):XMLList {
throw new System.NotImplementedException();
}
public function childIndex():int {
throw new System.NotImplementedException();
}
public function children():XMLList {
throw new System.NotImplementedException();
}
public function comments():XMLList {
throw new System.NotImplementedException();
}
public function contains(value:XML):Boolean {
throw new System.NotImplementedException();
}
public function copy():XML {
throw new System.NotImplementedException();
}
public static function defaultSettings():Object {
throw new System.NotImplementedException();
}
public function descendants():XMLList {
throw new System.NotImplementedException();
}
public function descendants(name:Object):XMLList {
throw new System.NotImplementedException();
}
public function elements():XMLList {
return new XMLList(mElement.GetElementsByTagName("*"));
}
public function elements(name:String):XMLList {
return new XMLList(mElement.GetElementsByTagName(name));
}
public function hasComplexContent():Boolean {
throw new System.NotImplementedException();
}
public function hasOwnProperty(p:String):Boolean {
throw new System.NotImplementedException();
}
public function hasSimpleContent():Boolean {
throw new System.NotImplementedException();
}
public function inScopeNamespaces():Array {
throw new System.NotImplementedException();
}
public function insertChildAfter(child1:Object, child2:Object):* {
throw new System.NotImplementedException();
}
public function insertChildBefore(child1:Object, child2:Object):* {
throw new System.NotImplementedException();
}
public function length():int {
throw new System.NotImplementedException();
}
public function localName():String {
return mElement.LocalName;
}
public function name():QName {
return new QName(mElement.NamespaceURI, mElement.Name);
}
public function @namespace(prefix:String = null):* {
throw new System.NotImplementedException();
}
public function namespaceDeclarations():Array {
throw new System.NotImplementedException();
}
public function nodeKind():String {
throw new System.NotImplementedException();
}
public function normalize():XML {
throw new System.NotImplementedException();
}
public function parent():* {
throw new System.NotImplementedException();
}
public function prependChild(value:Object):XML {
throw new System.NotImplementedException();
}
public function processingInstructions(name:String):XMLList {
throw new System.NotImplementedException();
}
public function propertyIsEnumerable(p:String):Boolean {
throw new System.NotImplementedException();
}
public function removeNamespace(ns:Namespace):XML {
throw new System.NotImplementedException();
}
public function replace(propertyName:Object, value:XML):XML {
throw new System.NotImplementedException();
}
public function setChildren(value:Object):XML {
throw new System.NotImplementedException();
}
public function setLocalName(name:String):void {
throw new System.NotImplementedException();
}
public function setName(name:String):void {
throw new System.NotImplementedException();
}
public function setNamespace(ns:Namespace):void {
throw new System.NotImplementedException();
}
public function setSettings(... rest):void {
throw new System.NotImplementedException();
}
public function settings():Object {
throw new System.NotImplementedException();
}
public function text():XMLList {
throw new System.NotImplementedException();
}
public function toJSON(k:String):* {
throw new System.NotImplementedException();
}
public function toString():String {
throw new System.NotImplementedException();
}
public function toXMLString():String {
throw new System.NotImplementedException();
}
public function valueOf():Object {
throw new System.NotImplementedException();
}
/*
public static implicit operator String (xml:XML) {
throw new System.NotImplementedException();
}
*/
}
}
+180
View File
@@ -0,0 +1,180 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public /*final*/ dynamic class XMLList
{
public function XMLList (value:*=null)
{
}
}
/*
import System.Xml.*;
import System.Collections.*;
import System.Collections.Generic.*;
import System.Linq.*;
public class XMLList implements IEnumerable.<XML> {
var mList:List.<XML> = new List.<XML>();
//
// Methods
//
public function XMLList(value:Object) {
if (value == null) {
// empty
}
else {
throw new System.NotImplementedException();
}
}
internal function XMLList(value:XmlNodeList)
{
// create list of XML from node list
for each ( var node:XmlNode in value) {
if (node is XmlElement) {
mList.Add(new XML(node));
}
}
}
internal function XMLList ()
{
}
public function attribute(attributeName:String):String {
if (mList.Count != 1)
throw new System.NotImplementedException();
return mList[0].attribute(attributeName);
}
public function attributes():XMLList {
throw new System.NotImplementedException();
}
public function child(propertyName:Object):XMLList {
throw new System.NotImplementedException();
}
public function children():XMLList {
throw new System.NotImplementedException();
}
public function comments():XMLList {
throw new System.NotImplementedException();
}
public function contains(value:XML):Boolean {
throw new System.NotImplementedException();
}
public function copy():XMLList {
throw new System.NotImplementedException();
}
public function descendants():XMLList {
throw new System.NotImplementedException();
}
public function descendants(name:Object):XMLList {
throw new System.NotImplementedException();
}
public function elements():XMLList {
throw new System.NotImplementedException();
}
public function elements(name:String):XMLList {
if (mList.Count == 0)
return new XMLList();
if (mList.Count != 1)
throw new System.NotImplementedException();
return mList[0].elements(name);
}
public function hasComplexContent():Boolean {
throw new System.NotImplementedException();
}
public function hasOwnProperty(p:String):Boolean {
throw new System.NotImplementedException();
}
public function hasSimpleContent():Boolean {
throw new System.NotImplementedException();
}
public function length():int {
throw new System.NotImplementedException();
}
public function normalize():XMLList {
throw new System.NotImplementedException();
}
public function parent():Object {
throw new System.NotImplementedException();
}
public function processingInstructions(name:String = "*"):XMLList {
throw new System.NotImplementedException();
}
public function propertyIsEnumerable(p:String):Boolean {
throw new System.NotImplementedException();
}
public function text():XMLList {
throw new System.NotImplementedException();
}
public function toString():String {
throw new System.NotImplementedException();
}
public function toXMLString():String {
throw new System.NotImplementedException();
}
public function valueOf():Object {
throw new System.NotImplementedException();
}
public indexer this(index:int):XML {
get { throw new System.NotImplementedException(); }
}
public static implicit operator String (list:XMLList) {
throw new System.NotImplementedException();
}
function IEnumerable.<XML>.GetEnumerator() : IEnumerator.<XML> {
return mList.GetEnumerator();
}
function IEnumerable.GetEnumerator() : IEnumerator {
return mList.GetEnumerator();
}
}
*/
}
+148
View File
@@ -0,0 +1,148 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
//
// Conversions (must be in C# to avoid conflicts).
//
public static class String_fn
{
public static string String (object o)
{
return o.ToString();
}
public static string String (string s)
{
return s;
}
public static string String (int i)
{
return i.ToString ();
}
public static string String (uint u)
{
return u.ToString ();
}
public static string String (double d)
{
return d.ToString ();
}
public static string String (bool b)
{
return b.ToString ();
}
}
public static class Number_fn
{
// Inlineable method
public static double Number (string s)
{
double d;
double.TryParse(s, out d);
return d;
}
}
public static class int_fn
{
// Inlineable method
public static int @int (string s)
{
int i;
int.TryParse(s, out i);
return i;
}
}
public static class uint_fn
{
// Inlineable method
public static uint @uint (string s)
{
uint u;
uint.TryParse(s, out u);
return u;
}
}
public static class Boolean_fn
{
// Not inlinable.. but required to get correct results in flash.
public static bool Boolean (object d)
{
if (d == null) return false;
TypeCode tc = Type.GetTypeCode(d.GetType());
switch (tc) {
case TypeCode.Boolean:
return (bool)d;
case TypeCode.SByte:
return (sbyte)d != 0;
case TypeCode.Byte:
return (byte)d != 0;
case TypeCode.Int16:
return (short)d != 0;
case TypeCode.UInt16:
return (ushort)d != 0;
case TypeCode.Int32:
return (int)d != 0;
case TypeCode.UInt32:
return (uint)d != 0;
case TypeCode.Int64:
return (long)d != 0;
case TypeCode.UInt64:
return (ulong)d != 0;
case TypeCode.Single:
return (float)d != 0.0f;
case TypeCode.Double:
return (double)d != 0.0;
case TypeCode.Decimal:
return (decimal)d != 0;
case TypeCode.String:
var s = (string)d;
return !string.IsNullOrEmpty(s) && s != "0" && s != "false";
case TypeCode.Empty:
return false;
case TypeCode.Object:
return d != null;
}
return false;
}
// Inlineable method
public static bool Boolean (string s)
{
throw new System.NotImplementedException();
}
}
}
+65
View File
@@ -0,0 +1,65 @@
// Copyright 2013 Zynga Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace _root
{
public static class @int
{
//
// Methods
//
public static string toExponential(this int i, uint fractionDigits) {
throw new NotImplementedException();
}
public static string toFixed(this int i, uint fractionDigits) {
throw new NotImplementedException();
}
public static string toPrecision(this int i, uint precision) {
throw new NotImplementedException();
}
public static string toString(this int i) {
throw new NotImplementedException();
}
public static string toString(this int i, uint radix) {
return Convert.ToString(i, (int)radix);
}
public static int valueOf(this int i) {
return i;
}
//
// Constants
//
public const int MAX_VALUE = 2147483647;
public const int MIN_VALUE = -2147483648;
}
public static class @uint
{
public const uint MAX_VALUE = System.UInt32.MaxValue;
public const uint MIN_VALUE = System.UInt32.MinValue;
}
}
+123
View File
@@ -0,0 +1,123 @@
//
// toplevel.play
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright 2013 Zynga Inc.
// Copyright (C) 2013 Xamarin, Inc (http://www.xamarin.com)
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package {
public function isA(obj:*, cl:Class):Boolean {
throw new System.NotImplementedException();
}
public function decodeURI(uri:String):String {
throw new System.NotImplementedException();
}
public function decodeURIComponent(uri:String):String {
throw new System.NotImplementedException();
}
public function encodeURI(uri:String):String {
throw new System.NotImplementedException();
}
public function encodeURIComponent(uri:String):String {
throw new System.NotImplementedException();
}
public function escape(str:String):String {
throw new System.NotImplementedException();
}
public function isFinite(num:Number):Boolean {
throw new System.NotImplementedException();
}
public function isNaN (num:Number = NaN):Boolean
{
return System.Double.IsNaN (num);
}
public function isXMLName(str:String):Boolean {
throw new System.NotImplementedException();
}
public function parseFloat(str:String):Number {
if (!System.String.IsNullOrEmpty(str))
{
return System.Double.Parse(str);
} else {
return System.Double.NaN;
}
}
public function trace(o:System.Object):void {
// System.Diagnostics.Debug.WriteLine(o);
System.Console.WriteLine(o);
}
public function trace(o1:System.Object, o2:System.Object):void {
// System.Diagnostics.Debug.WriteLine("{0}{1}", o1, o2);
System.Console.WriteLine("{0} {1}", o1, o2);
}
public function trace(o1:System.Object, o2:System.Object, o3:System.Object):void {
// System.Diagnostics.Debug.WriteLine("{0}{1}{2}", o1, o2, o3);
System.Console.WriteLine("{0} {1} {2}", o1, o2, o3);
}
public function trace(o1:System.Object, o2:System.Object, o3:System.Object, ...args):void {
var argsStr = System.String.Concat(args);
// System.Diagnostics.Debug.WriteLine("{0}{1}{2}{3}", o1, o2, o3, argsStr);
System.Console.WriteLine("{0} {1} {2} {3}", o1, o2, o3, argsStr);
}
public function parseInt(str:String, radix:uint = 0):int {
if (radix != 0 && radix != 10)
throw new System.NotImplementedException();
return System.Int32.Parse(str);
}
public function unescape(str:String):String {
throw new System.NotImplementedException();
}
//
// Constants
// Non-static in AS but why not make them static
//
public static const undefined : * = PlayScript.Runtime.Undefined.Value;
public static const Infinity : Number = System.Double.PositiveInfinity;
public static const NaN : Number = System.Double.NaN;
/*
public function loadEmbed(baseObject:Object, fieldName:String):Object
{
// pass this off to C# code
return PlayScript.Player.LoadEmbed(baseObject, fieldName);
}
public function invokeStaticMethod(type:Class, methodName:String, args:Array):Object
{
// pass this off to C# code
return PlayScript.Player.InvokeStaticMethod(type, methodName, args);
}
*/
}
@@ -12,7 +12,7 @@ CLEAN_FILES += $(STRING_MESSAGES)
EXTRA_DISTFILES = \
src/ComponentModel/Strings.resx
VALID_PROFILE := $(filter net_4_0 net_4_5 monotouch monodroid, $(PROFILE))
VALID_PROFILE := $(filter net_4_0 net_4_5 monotouch monodroid mobile_static, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll
NO_INSTALL = yes
@@ -1,4 +1,4 @@
#if !MONOTOUCH
#if !FULL_AOT_RUNTIME
// -----------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// -----------------------------------------------------------------------
@@ -1,4 +1,4 @@
#if !MONOTOUCH
#if !FULL_AOT_RUNTIME
// -----------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// -----------------------------------------------------------------------
@@ -32,7 +32,7 @@ namespace System.ComponentModel.Composition
{
if(!metadataViewType.IsAttributeDefined<MetadataViewImplementationAttribute>())
{
#if !MONOTOUCH
#if !FULL_AOT_RUNTIME
try
{
proxyType = MetadataViewGenerator.GenerateView(metadataViewType);
@@ -87,7 +87,7 @@ namespace System.ComponentModel.Composition
}
catch (TargetInvocationException ex)
{
#if !MONOTOUCH
#if !FULL_AOT_RUNTIME
//Unwrap known failures that we want to present as CompositionContractMismatchException
if(metadataViewType.IsInterface)
{
@@ -42,7 +42,7 @@ namespace System.ComponentModel.Composition.Primitives
private Type CreateStandardDelegateType()
{
#if MONOTOUCH
#if FULL_AOT_RUNTIME
throw new NotImplementedException ();
#else
ParameterInfo[] parameters = this._method.GetParameters();
@@ -18,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid, $(PROFILE))
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid mobile_static, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.ComponentModel.DataAnnotations.dll
NO_INSTALL = yes
@@ -0,0 +1,118 @@
//
// CompareAttribute.cs
//
// Authors:
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com)
// Copyright (C) 2013 Pablo Ruiz García
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Linq;
using System.Globalization;
using System.ComponentModel;
using System.Collections.Generic;
namespace System.ComponentModel.DataAnnotations
{
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class CompareAttribute : ValidationAttribute
{
private const string DefaultErrorMessage = "'{0}' and '{1}' do not match.";
private const string NonExistingPropertyErrorMessage = "Could not find a property named {0}.";
private string _otherProperty;
private string _otherPropertyDisplayName;
public CompareAttribute (string otherProperty)
: base (() => DefaultErrorMessage)
{
if (string.IsNullOrEmpty (otherProperty))
throw new ArgumentNullException ("otherProperty");
_otherProperty = otherProperty;
}
public string OtherProperty { get { return _otherProperty; } }
public string OtherPropertyDisplayName { get { return _otherPropertyDisplayName; } }
public override bool RequiresValidationContext { get { return true; } }
private IEnumerable<Attribute> GetPropertyAttributes (Type type, string propertyName)
{
#if MOBILE
return TypeDescriptor.GetProperties (type).Find (propertyName, false).Attributes.OfType<Attribute> ();
#else
// Using AMTTDP seems the way to go to be able to relay on attributes declared
// by means of associated classes not directly decorating the property.
// See: http://msdn.microsoft.com/en-us/library/system.componentmodel.dataannotations.associatedmetadatatypetypedescriptionprovider.aspx
return new AssociatedMetadataTypeTypeDescriptionProvider (type)
.GetTypeDescriptor (type)
.GetProperties ()
.Find (propertyName, false)
.Attributes.OfType<Attribute> ();
#endif
}
private void ResolveOtherPropertyDisplayName (ValidationContext context)
{
if (_otherPropertyDisplayName == null)
{
// NOTE: From my own tests, it seems MS.NET looksup displayName from various sources, what follows
// is a best guess from my on tests, however, I am probably missing some corner cases. (pruiz)
var attributes = GetPropertyAttributes (context.ObjectType, _otherProperty);
var displayAttr = attributes.FirstOrDefault (x => x is DisplayAttribute) as DisplayAttribute;
var displayNameAttr = attributes.FirstOrDefault (x => x is DisplayNameAttribute) as DisplayNameAttribute;
if (displayAttr != null) _otherPropertyDisplayName = displayAttr.GetName ();
else if (displayNameAttr != null) _otherPropertyDisplayName = displayNameAttr.DisplayName;
_otherPropertyDisplayName = _otherProperty;
}
}
public override string FormatErrorMessage (string name)
{
var oname = string.IsNullOrEmpty (_otherPropertyDisplayName) ? _otherProperty : _otherPropertyDisplayName;
return string.Format (ErrorMessageString, name, oname);
}
protected override ValidationResult IsValid(object value, ValidationContext context)
{
var property = context.ObjectType.GetProperty (_otherProperty);
if (property == null) {
string message = string.Format (NonExistingPropertyErrorMessage, _otherProperty);
return new ValidationResult (message);
}
// XXX: Could not find a better place to call this, as this is
// the only place we have access to a ValidationContext. (pruiz)
ResolveOtherPropertyDisplayName (context);
return object.Equals (property.GetValue (context.ObjectInstance, null), value) ? null
: new ValidationResult (FormatErrorMessage (context.DisplayName));
}
}
}
#endif
@@ -0,0 +1,81 @@
//
// CreditCardAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
// Copyright (C) 2013 Pablo Ruiz García
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Linq;
using System.Globalization;
namespace System.ComponentModel.DataAnnotations
{
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class CreditCardAttribute : DataTypeAttribute
{
private const string DefaultErrorMessage = "The {0} field is not a valid credit card number.";
public CreditCardAttribute ()
: base(DataType.CreditCard)
{
// XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
base.ErrorMessage = DefaultErrorMessage;
}
public override bool IsValid(object value)
{
if (value == null)
return true;
if (string.IsNullOrEmpty(value as string))
return false;
// Remove any invalid characters..
var creditCardNumber = (value as string).Replace("-", "").Replace(" ", "");
if (creditCardNumber.Any (x => !Char.IsDigit (x)))
return false;
// Performan a Luhn-based check against credit card number.
//
// See: http://en.wikipedia.org/wiki/Luhn_algorithm
// See: http://rosettacode.org/wiki/Luhn_test_of_credit_card_numbers
// See: http://www.codeproject.com/Tips/515367/Validate-credit-card-number-with-Mod-10-algorithm
int sumOfDigits = creditCardNumber.Where((e) => e >= '0' && e <= '9')
.Reverse()
.Select((e, i) => ((int)e - 48) * (i % 2 == 0 ? 1 : 2))
.Sum((e) => e / 10 + e % 10);
return sumOfDigits % 10 == 0;
}
}
}
#endif
@@ -46,7 +46,12 @@ namespace System.ComponentModel.DataAnnotations
Password,
Url,
#if NET_4_0
ImageUrl
ImageUrl,
#endif
#if NET_4_5
CreditCard,
PostalCode,
Upload
#endif
}
}
@@ -3,10 +3,10 @@
//
// Author:
// Atsushi Enomoto <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2008 Novell Inc. http://novell.com
//
// Copyright (C) 2013 Pablo Ruiz García
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -50,6 +50,27 @@ namespace System.ComponentModel.DataAnnotations
displayFormat.ApplyFormatInEditMode = true;
displayFormat.ConvertEmptyStringToNull = true;
displayFormat.DataFormatString = "{0:t}";
#if NET_4_0
displayFormat.HtmlEncode = true;
#endif
break;
case DataType.Date:
displayFormat = new DisplayFormatAttribute ();
displayFormat.ApplyFormatInEditMode = true;
displayFormat.ConvertEmptyStringToNull = true;
displayFormat.DataFormatString = "{0:d}";
#if NET_4_0
displayFormat.HtmlEncode = true;
#endif
break;
case DataType.Currency:
displayFormat = new DisplayFormatAttribute ();
displayFormat.ApplyFormatInEditMode = false;
displayFormat.ConvertEmptyStringToNull = true;
displayFormat.DataFormatString = "{0:C}";
#if NET_4_0
displayFormat.HtmlEncode = true;
#endif
break;
default:
@@ -0,0 +1,73 @@
//
// EmailAddressAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
// Copyright (C) 2013 Pablo Ruiz García
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Globalization;
using System.Text.RegularExpressions;
namespace System.ComponentModel.DataAnnotations
{
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class EmailAddressAttribute : DataTypeAttribute
{
private const string DefaultErrorMessage = "The {0} field is not a valid e-mail address.";
// See: http://stackoverflow.com/questions/16167983/best-regular-expression-for-email-validation-in-c-sharp
// See: http://en.wikipedia.org/wiki/List_of_Internet_top-level_domains
private const string _emailRegexStr = @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*" +
@"@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-z0-9])?\.)+(?:[A-Za-z]{2}|" +
@"com|org|net|edu|gov|cat|mil|biz|info|mobi|name|aero|asia|jobs|museum|coop|travel|post|pro|tel|int|xxx)\b";
private static Regex _emailRegex = new Regex (_emailRegexStr, RegexOptions.IgnoreCase | RegexOptions.Compiled);
public EmailAddressAttribute ()
: base(DataType.EmailAddress)
{
// XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
base.ErrorMessage = DefaultErrorMessage;
}
public override bool IsValid(object value)
{
if (value == null)
return true;
if (value is string)
{
var str = value as string;
return !string.IsNullOrEmpty(str) ? _emailRegex.IsMatch(str) : false;
}
return false;
}
}
}
#endif
@@ -0,0 +1,92 @@
//
// FileExtensionAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
// Copyright (C) 2013 Pablo Ruiz García
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Linq;
using System.Globalization;
using System.Text.RegularExpressions;
namespace System.ComponentModel.DataAnnotations
{
// See: http://msdn.microsoft.com/en-us/library/system.componentmodel.dataannotations.fileextensionsattribute.aspx
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class FileExtensionsAttribute : DataTypeAttribute
{
private const string DefaultErrorMessage = "The {0} field only accepts files with the following extensions: {1}.";
private const string DefaultExtensions = "png,jpg,jpeg,gif";
public FileExtensionsAttribute ()
: base (DataType.Upload)
{
// XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
base.ErrorMessage = DefaultErrorMessage;
this.Extensions = DefaultExtensions;
}
public string Extensions { get; set; }
private string[] GetExtensionList ()
{
return (Extensions ?? "").Split (',');
}
private string GetExtension (string filename)
{
var parts = filename.Split ('.');
return parts.Length > 0 ? parts [parts.Length - 1] : "";
}
public override string FormatErrorMessage (string name)
{
var extensions = GetExtensionList().Aggregate ((cur, next) => cur + ", " + next);
return string.Format (ErrorMessageString, name, extensions);
}
public override bool IsValid(object value)
{
if (value == null)
return true;
if (value is string)
{
var str = value as string;
var ext = GetExtension (str);
return GetExtensionList ().Any (x => string.Equals (x, ext, StringComparison.InvariantCultureIgnoreCase));
}
return false;
}
}
}
#endif
@@ -3,6 +3,7 @@
//
// Authors:
// Marek Safar <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com)
//
@@ -28,22 +29,63 @@
#if NET_4_5
using System;
using System.Globalization;
namespace System.ComponentModel.DataAnnotations
{
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class MaxLengthAttribute : ValidationAttribute
{
private const string DefaultErrorMessage = "The field {0} must be a string or array type with a maximum length of '{1}'.";
private const string InvalidLengthErrorMessage = "MaxLengthAttribute must have a Length value that is greater than zero. " +
"Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length.";
private bool _maxLength = true;
public MaxLengthAttribute ()
: base (() => DefaultErrorMessage)
{
}
public MaxLengthAttribute (int length)
: this ()
{
Length = length;
_maxLength = false;
}
public int Length { get; private set; }
public override string FormatErrorMessage (string name)
{
return string.Format (ErrorMessageString, name, Length);
}
public override bool IsValid (object value)
{
// See: http://msdn.microsoft.com/en-us/library/gg696614.aspx
if (this.Length == 0 || this.Length < -1)
throw new InvalidOperationException (InvalidLengthErrorMessage);
// Weird, but using 'MaxLength' with no length seems to be valid
// and we should be returning true, and not throwing. (pablo)
if (value != null && !_maxLength) {
if (value is string) {
return (value as string).Length <= this.Length;
}
if (value is Array) {
return (value as Array).Length <= this.Length;
}
// NOTE: from my tests, MS.NET does not support IEnumerable as value. :(
}
return true;
}
}
}
#endif
#endif
@@ -3,6 +3,7 @@
//
// Authors:
// Marek Safar <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
//
@@ -28,30 +29,54 @@
#if NET_4_5
using System;
using System.Globalization;
namespace System.ComponentModel.DataAnnotations
{
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class MinLengthAttribute : ValidationAttribute
{
private const string DefaultErrorMessage = "The field {0} must be a string or array type with a minimum length of '{1}'.";
private const string InvalidLengthErrorMessage = "MinLengthAttribute must have a Length value that is zero or greater.";
public MinLengthAttribute ()
{
}
public MinLengthAttribute (int length)
{
Length = length;
}
[MonoTODO]
public override bool IsValid (object value)
{
return true;
}
public int Length { get; private set; }
public override string FormatErrorMessage (string name)
{
// TODO:
return base.FormatErrorMessage (name);
return string.Format (ErrorMessageString, name, Length);
}
public override bool IsValid (object value)
{
if (this.Length < 0)
throw new InvalidOperationException (InvalidLengthErrorMessage);
if (value != null) {
if (value is string) {
return (value as string).Length >= this.Length;
}
if (value is Array) {
return (value as Array).Length >= this.Length;
}
// NOTE: from my tests, MS.NET does not support IEnumerable as value. :(
}
return true;
}
}
}
#endif
#endif
@@ -0,0 +1,69 @@
//
// PhoneAttribute.cs
//
// Authors:
// Marek Safar <[email protected]>
// Pablo Ruiz García <[email protected]>
//
// Copyright (C) 2013 Xamarin Inc (http://www.xamarin.com)
// Copyright (C) 2013 Pablo Ruiz García
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Globalization;
using System.Text.RegularExpressions;
namespace System.ComponentModel.DataAnnotations
{
[AttributeUsageAttribute (AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
public class PhoneAttribute : DataTypeAttribute
{
private const string DefaultErrorMessage = "The {0} field is not a valid phone number.";
private const string _regexStr = @"^\+?(\d[\d-. ]+)?(\([\d-. ]+\))?[\d-. ]+\d$";
private static Regex _regex = new Regex (_regexStr, RegexOptions.IgnoreCase | RegexOptions.Compiled);
public PhoneAttribute ()
: base(DataType.PhoneNumber)
{
// XXX: There is no .ctor accepting Func<string> on DataTypeAttribute.. :?
base.ErrorMessage = DefaultErrorMessage;
}
public override bool IsValid(object value)
{
if (value == null)
return true;
if (value is string)
{
var str = value as string;
return !string.IsNullOrEmpty(str) ? _regex.IsMatch(str) : false;
}
return false;
}
}
}
#endif
@@ -28,6 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Globalization;
using System.ComponentModel;
namespace System.ComponentModel.DataAnnotations
@@ -30,6 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Globalization;
using System.ComponentModel;
using System.Text.RegularExpressions;
@@ -60,7 +61,7 @@ namespace System.ComponentModel.DataAnnotations
public override string FormatErrorMessage (string name)
{
return string.Format(ErrorMessageString, name, Pattern);
return string.Format (ErrorMessageString, name, Pattern);
}
// LAMESPEC: does not throw ValidationException when value does not match the regular expression
@@ -29,6 +29,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Globalization;
using System.ComponentModel;
namespace System.ComponentModel.DataAnnotations
Loaded 100 of 967 files, more files were not shown because too many files have changed in this diff. Show more