mx2cc cleanups and version bump.

src/common.sh

@@ -7,12 +7,12 @@ ted2_new=""
 if [ "$OSTYPE" = "linux-gnu" ]
 then
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="mx2new/mx2cc.buildv005/desktop_release_linux/mx2cc"
+	mx2cc_new="mx2new/mx2cc.buildv006/desktop_release_linux/mx2cc"
 	ted2="../bin/ted2_linux"
-	ted2_new="ted2/ted2.buildv005/desktop_release_linux/ted2"
+	ted2_new="ted2/ted2.buildv006/desktop_release_linux/ted2"
 else
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="mx2new/mx2cc.buildv005/desktop_release_macos/mx2cc.app/Contents/MacOS/mx2cc"
+	mx2cc_new="mx2new/mx2cc.buildv006/desktop_release_macos/mx2cc.app/Contents/MacOS/mx2cc"
 	ted2="../bin/ted2.app"
-	ted2_new="ted2/ted2.buildv005/desktop_release_macos/ted2.app"
+	ted2_new="ted2/ted2.buildv006/desktop_release_macos/ted2.app"
 fi

src/emrebuildmods.bat

@@ -1,3 +1,3 @@
 
-..\bin\mx2cc_windows makemods -clean -config=debug -target=emscripten
+..\bin\mx2cc_windows makemods -clean -config=release -target=emscripten
 

src/emrebuildmods.sh

@@ -1,4 +1,4 @@
 
 source common.sh
 
-$mx2cc makemods -clean -config=debug -target=emscripten
+$mx2cc makemods -clean -config=release -target=emscripten

src/emupdatemods.bat

@@ -1,2 +1,2 @@
 
-..\bin\mx2cc_windows makemods -config=debug -target=emscripten
+..\bin\mx2cc_windows makemods -config=release -target=emscripten

src/emupdatemods.sh

@@ -1,4 +1,4 @@
 
 source common.sh
 
-$mx2cc makemods -config=debug -target=emscripten
+$mx2cc makemods -config=release -target=emscripten

src/makedocs.bat

@@ -1,4 +1,4 @@
 
 echo off
 
-..\bin\mx2cc_windows makedocs
+..\bin\mx2cc_windows makedocs monkey std mojo

src/makedocs.sh

@@ -1,4 +1,5 @@
 
 source common.sh
 
-$mx2cc makedocs
+$mx2cc makedocs monkey std mojo
+

src/mx2new/docsmaker.monkey2

@@ -160,7 +160,7 @@ Class DocsMaker
 		
 		_buf.Clear()
 		
-		Local docs:=std.markdown.MarkdownToHtml( markdown )
+		Local docs:=hoedown.MarkdownToHtml( markdown )
 		
 		Return docs
 	End
@@ -235,7 +235,7 @@ Class DocsMaker
 			
 				Local id:=path.Slice( i0 )
 '				Print "Finding node "+id+" in "+scope.Name
-				
+
 				Local node:=scope.FindNode( id )
 				If Not node Return ""
 				
@@ -258,8 +258,17 @@ Class DocsMaker
 			i0=i1+1
 			
 '			Print "Finding type "+id+" in "+scope.Name
-			
-			Local type:=scope.FindType( id )
+
+			Local type:Type
+			If scope
+				type=scope.FindType( id )
+			Else
+				For Local fscope:=Eachin _module.fileScopes
+					If id<>fscope.nmspace.ntype.ident Continue
+					type=fscope.nmspace.ntype
+					Exit
+				Next
+			Endif
 			If Not type Return ""
 			
 			Local ntype:=TCast<NamespaceType>( type )

src/mx2new/htmldocsmaker.monkey2

@@ -38,8 +38,19 @@ Class HtmlDocsMaker Extends DocsMaker
 			
 			nmspaces[nmspace.ntype.ident]=nmspace
 		Next
+
+		Local page:=""
+		Local md:=stringio.LoadString( _module.baseDir+"/docs/"+_module.name+".md" )
+		If md
+			_scope=Null
+			page="module"
+			Emit( md )
+			Local html:=Flush()
+			SavePage( html,page )
+		Endif
 		
-		BeginNode( "<"+_module.name+">" )
+'		BeginNode( "<"+_module.name+">",page )
+		BeginNode( _module.name,page )
 		
 		For Local nmspace:=Eachin nmspaces.Values
 		
@@ -85,12 +96,7 @@ Class HtmlDocsMaker Extends DocsMaker
 		_posStack.Push( _sep )
 		_posStack.Push( _buf.Length )
 		EmitTree( "{ name:'"+name+"'"+page+",children:[" )
-			
-'		If page page=",page:'"+page+"'"
-'		Local module:=",module:'"+_module.name+"'"
-'		_posStack.Push( _sep )
-'		_posStack.Push( _buf.Length )
-'		EmitTree( "{ name:'"+name+"'"+module+page+",children:[" )
+
 	End
 	
 	Method EndNode( force:Bool=False )
@@ -106,10 +112,6 @@ Class HtmlDocsMaker Extends DocsMaker
 	
 		If page page=",page:'"+_module.name+":"+page+"'"
 		EmitTree( "{ name:'"+name+"'"+page+",children:[] }" )
-
-'		If page page=",page:'"+page+"'"
-'		Local module:=",module:'"+_module.name+"'"
-'		EmitTree( "{ name:'"+name+"'"+module+page+",children:[] }" )
 		
 	End
 	
@@ -117,24 +119,18 @@ Class HtmlDocsMaker Extends DocsMaker
 
 		EmitLeaf( decl.ident,page )
 
-'		EmitLeaf( DeclIdent( decl,False ),page )
 	End
 	
 	Method EmitNode( decl:Decl,scope:Scope,page:String="",force:Bool=False )
 	
 		EmitNode( decl.ident,scope,page,force )
 
-'		EmitNode( DeclIdent( decl,False ),scope,page,force )
 	End
 	
 	Method EmitNode( name:String,scope:Scope,page:String="",force:Bool=False )
 	
 		BeginNode( name,page )
 	
-'		BeginNode( "Namespaces" )
-'		EmitNamespaces( scope )
-'		EndNode()
-
 		BeginNode( "Aliases" )
 		EmitAliases( scope,"alias" )
 		EndNode()

src/mx2new/mx2.monkey2

@@ -47,4 +47,4 @@ Using lib.c
 ' 3) edit .sh and .bat files to use new version (common.sh, updatemx2cc.bat, rebuildmx2cc.bat)
 ' 4) ./rebuildall
 '
-Const MX2CC_VERSION:="005"
+Const MX2CC_VERSION:="006"

src/mx2new/mx2cc.monkey2

@@ -3,7 +3,8 @@ Namespace mx2cc
 
 Using mx2.docs
 
-#Import "<std.monkey2>"
+#Import "<hoedown>"
+#Import "<std>"
 
 #Import "mx2.monkey2"
 
@@ -19,7 +20,7 @@ Using libc
 
 Global StartDir:String
 
-Const TestArgs:="mx2cc makemods -clean"
+Const TestArgs:="mx2cc makedocs std"
 
 'Const TestArgs:="mx2cc makeapp src/ted2/ted2.monkey2"
 

src/mx2new/test.monkey2

@@ -1,32 +1,15 @@
 
-Namespace test
+#Import "<std.monkey2>"
 
-Function Test:Float()
-	Return 10
-End
-
-Global GlobalColor:Color
+Using std..
 
-Struct Color
+Struct S
 
-	Field r:Float
-	Field g:Float
-	Field b:Float
-	Field a:Float=1
-	
-	Method New()
-		a=Test()
+	Method New( s:S )
 	End
-	
+
 End
 
 Function Main()
 
-	Local color:Color
-	
-	Print color.a
-	
-	color=New Color
-	
-	Print color.a
 End

src/rebuildmx2cc.bat

@@ -6,4 +6,4 @@ echo ***** Rebuilding mx2cc *****
 echo.
 
 ..\bin\mx2cc_windows makeapp -clean -config=release mx2new/mx2cc.monkey2
-copy mx2new\mx2cc.buildv005\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+copy mx2new\mx2cc.buildv006\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe

src/updatemx2cc.bat

@@ -6,4 +6,4 @@ echo ***** Updating mx2cc *****
 echo.
 
 ..\bin\mx2cc_windows makeapp -config=release mx2new/mx2cc.monkey2
-copy mx2new\mx2cc.buildv005\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+copy mx2new\mx2cc.buildv006\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe