Ticket #275: java-fix.patch

Source/BackEndJvm/JavaGenerator.cobra

@@ -38 +38 @@
         _fullJarFileName = outName
         return outName
         
+    def createJavaFile(fileName as String, contents as String)
+        #print 'output: ', contents
+        File.writeAllText(fileName, contents)
+        .addIntermediateFile(fileName)
+
     def writeJava
         Node.setCompiler(this)
         try
@@ -56 +61 @@
             
     def writeJavaTestInvocation
         # TODO
+        #fileName = 'test-[dt.year][dt.month][dt.day][dt.hour][dt.minute].java'   # to-do: format the numbers to have leading zeros
+        #w = CodeCommentLineWriter()
+        # ...
+        #.createJavaFile(fileName, w.output)
         print 'TODO: writeJavaTestInvocation'
 
     def compileJava
@@ -276 +285 @@
     def newJavaFile( cobraModuleName as String, javaFileName as String) as CurlyWriter
         #print 'newJavaFile [javaFileName]'
         sw = CodeCommentLineWriter()
-        .addIntermediateFile(javaFileName)
         sw.start(cobraModuleName)
         sw.write('// [javaFileName] from [cobraModuleName]\n')
         sw.write('// Generated by Cobra-[CommandLine.versionString]\n')
         sw.write('// on [DateTime.now]\n')
         # TODO: list op sys
         sw.write('\n')
-        File.writeAllText(javaFileName, sw.output)
         return sw
     
         
@@ -417 +424 @@
             else
                 .topNameSpace.writeJavaDef(sw)
             d = sw.curlyToCobraLineNum
+            (.compiler to Compiler).createJavaFile(.javaFileName, sw.output)
         return d
         
     def writeJavaTestInvocation(sw as CurlyWriter) is override
@@ -627 +635 @@
                     decl.writeJavaDef(sw)
                     javaToCobraLineNum = sw.curlyToCobraLineNum
                     compiler.storeJavaFileInfo(cobraModName, javaToCobraLineNum)
+                    (.compiler to Compiler).createJavaFile(javaFileName, sw.output)
             
             if decl inherits Box, .compiler.boxStack.pop
 
@@ -1309 +1318 @@
         base.writeJavaDef(sw)
         # TODO
         #if .type.isReference and not .type inherits NilableType
-        #   sw.write(r'[Cobra.Core.NotNull] ') 
+        #   sw.write(r'[Cobra.Core.NotNull] ') # TODO: annotations on params avail in Java8
         branch .direction
             on Direction.In, pass
             on Direction.InOut, sw.write('/*inOut*/')   # default
             on Direction.Out, sw.write('/*out*/')       # TODO
         sw.write('[.type.javaParamRef] [.javaName]')
+#       if .optValue    # Net4 optional param
+#           detail='For java at the moment you will need to recode the optional parameter method as a set of overloaded (possibly cascaded) methods with the desired number of parameters.'
+#           .compiler.warning(this, 'Java does not support optional parameters. Default parameter value setting is ignored. [detail]')
+#           #sw.write('=')
+#           #_optValue.writeSharpDef(sw)
 
     def writeJavaDefSansReferenceLabels(sw as CurlyWriter)
         """
         Writes the parameter declaration but without Java "out" or "ref"--these are not available for
         contract methods (require_foo and ensure_foo) because contracts cannot modify arguments.
         """
-        # skip the [NotNull] as well since it's not really needed
         sw.write('[.type.javaRef] [.javaName]')     
 
 
@@ -3523 +3539 @@
                 on + 8, s = 'short'  # unsigned Byte uint8
                 on -16, s = 'short'  #'Int16'
                 on +16, s = 'int'    # unsigned short UInt16'
-                on -32, s = 'int'    # int32
+                on -32, s = ''       # int32
                 on +32, s = 'long'   # unsigned int32
-                on -64, s = 'long'
+                on -64, s = 'L'      #'long'
                 on +64, s = 'long'   # unsigned int64
                 else, throw FallThroughException(info)
         if s.length <= 2

Source/BackEndCommon/CurlyWriter.cobra

@@ -5 +5 @@
 
 
 
-class CurlyWriter is abstract
+class CurlyWriter is abstract implements IDisposable
 
     var _sb as StringBuilder
 
@@ -140 +140 @@
     
     def output as String
         return _sb.toString
+    
+    def dispose is new
+        pass
+        
 
 
 class CodePoundLineWriter inherits CurlyWriter