Browse Source

Updated versioning system to YYYY.VV, version to 2018.04

Mark Sibly 7 years ago
parent
commit
2cc67d4578
5 changed files with 25 additions and 17 deletions
  1. 1 1
      ABOUT.HTML
  2. 5 1
      VERSIONS.TXT
  3. 6 1
      src/mx2cc/mx2.monkey2
  4. 3 5
      src/mx2cc/mx2cc.monkey2
  5. 10 9
      src/mx2cc/test.monkey2

+ 1 - 1
ABOUT.HTML

@@ -45,7 +45,7 @@ a:hover{
 
 
 <body>
 <body>
 
 
-<h1>Monkey2 v1.1.11</h1>
+<h1>Monkey2 v2018.03</h1>
 
 
 <p>Welcome to monkey2, an open source, user friendly, cross platform programming language by Mark Sibly.
 <p>Welcome to monkey2, an open source, user friendly, cross platform programming language by Mark Sibly.
 
 

+ 5 - 1
VERSIONS.TXT

@@ -1,5 +1,9 @@
 
 
-***** Monkey2 v1.1.12 *****
+***** Monkey2 v2018.03 *****
+
+Big version numbering system change! Now just YYYY.VV Uses 2 digits for version so stringized versions can sort properly in github.
+
+Typeinfo.Name now always returns proper typename even if reflection info disabled and even for generic types. Typeinfo.Name used to return a 'unknown@12345678' style string.
 
 
 String.ToUpper, String.ToLower and String.Capitalize now use java equivalents internally on android 'coz NDK doesn't support locales.
 String.ToUpper, String.ToLower and String.Capitalize now use java equivalents internally on android 'coz NDK doesn't support locales.
 
 

+ 6 - 1
src/mx2cc/mx2.monkey2

@@ -44,4 +44,9 @@ Using std.collections
 Using libc
 Using libc
 
 
 'Make sure to rebuildall after changing this!
 'Make sure to rebuildall after changing this!
-Const MX2CC_VERSION:="1.1.11"
+Const MX2CC_VERSION:="2018.04"
+
+'For 'emergency patch' versions, 'b', 'c' etc...
+Const MX2CC_VERSION_EXT:=""
+
+

+ 3 - 5
src/mx2cc/mx2cc.monkey2

@@ -18,19 +18,17 @@ Using libc..
 Using std..
 Using std..
 Using mx2..
 Using mx2..
 
 
-Const MX2CC_VERSION_EXT:=""
-
 Global opts_time:Bool
 Global opts_time:Bool
 
 
 Global StartDir:String
 Global StartDir:String
 
 
-Const TestArgs:="mx2cc makemods pyro-framework"
+'Const TestArgs:="mx2cc makemods"' pyro-framework"
  
  
+Const TestArgs:="mx2cc makeapp src/mx2cc/test.monkey2"
+
 'Const TestArgs:="mx2cc makeapp D:\Plane-Demo-master\Plane.monkey2"
 'Const TestArgs:="mx2cc makeapp D:\Plane-Demo-master\Plane.monkey2"
 
 
 'Const TestArgs:="mx2cc makemods -target=ios"' monkey libc"
 'Const TestArgs:="mx2cc makemods -target=ios"' monkey libc"
- 
-'Const TestArgs:="mx2cc makeapp -clean src/mx2cc/test.monkey2"
 
 
 Function Main()
 Function Main()
 	
 	

+ 10 - 9
src/mx2cc/test.monkey2

@@ -1,21 +1,22 @@
 
 
-#reflect test
-
 Namespace test
 Namespace test
 
 
 Class C
 Class C
+End
+
+Struct S<T>
+End
+
+Alias Si:S<Int>
 
 
+Function Get<T>:TypeInfo()
+	Return Typeof( Cast<T>( Null ) )
 End
 End
 
 
 Function Main()
 Function Main()
 	
 	
-'	Local c:C'=New C
-
-	Local v:=Typeof<C>.NullValue
+	Print Typeof<C>
 	
 	
-	Local c:=Cast<C>( v )
+	Print Typeof<Si>
 	
 	
-	If c Print "no null" Else Print "null"
-		
-	Print Typeof(c)=Typeof<C>
 End
 End