Ticket #207: warn-deprecated-sharp-keyword.patch

Source/TypeProxies.cobra

@@ -286 +286 @@
 
     def _hack(clrType as Type) as IType
         if clrType.isInterface
-            return ClrTypeProxy($sharp('typeof(System.ICloneable)')).realType
+            return ClrTypeProxy(sharp'typeof(System.ICloneable)').realType
         else
             return ClrTypeProxy(Object).realType
 

Source/SyntaxHighlighter.cobra

@@ -184 +184 @@
                     on 'SHARP_SINGLE' or 'SHARP_DOUBLE'  # sharp'...'
                         .add(charNum, 5, 'kw', 'sharp')
                         .add(charNum+5, len-5, 'ls', text[5:])
-                    on 'SHARP_OPEN'
-                        .add(charNum, 6, 'kw', '$sharp')
+                    on 'SHARP_OPEN' 
+                        .add(charNum, 6, 'kw', '$sharp') # deprecated
                     on 'STRING_START_SINGLE' or 'STRING_START_DOUBLE'
                         .add(charNum, len-1, 'ls', text[:-1])
                         .add(charNum+len-1, 1, 'lslb', '\[')

Source/Expr.cobra

@@ -1899 +1899 @@
         if expr inherits StringLit  # TODO:? make this an arg type
             _expr = expr
         else
-            assert false, r'$sharp expression must be a String Literal (No substitutions) expr=[expr]'
+            assert false, r'sharp expression must be a String Literal (No substitutions) expr=[expr]'
 
     get allExprs as Expr*
         for expr in base.allExprs, yield expr
@@ -1914 +1914 @@
             quote = if(.token.text.startsWith('sharp"'), '"', "'")
             return "sharp[quote][_sharpSource][quote]"
         else
-            return "$sharp('[_expr.toCobraSource]')"
+            return "sharp'[_expr.toCobraSource]'"
 
     def _bindImp is override
         base._bindImp

Source/Compiler.cobra

@@ -711 +711 @@
         # TODO: try this out on MS .NET and if it works there, use it there
         # TODO: file a Mono bug report (or ping an existing one)
         # curDomain = AppDomain.currentDomain
-        # $sharp('curDomain.ReflectionOnlyAssemblyResolve += _resolveEvent')
+        # sharp'curDomain.ReflectionOnlyAssemblyResolve += _resolveEvent'
 
         for reference in references
             if not .loadReference(reference)

Source/Cobra.Lang/CobraFrame.cobra

@@ -19 +19 @@
             _methodName = methodName
             _fileName = fileName
             _lineNum = lineNum
-            _args = $sharp(r'(object[])args.Clone()')
+            _args = sharp'(object[])args.Clone()'
             _locals = Dictionary<of String, dynamic?>()
             _localNamesInOrder = List<of String>()
             for j = 0 .. _args.length ++ 2

Source/IndentedWriter.cobra

@@ -39 +39 @@
     ## Other
 
     def dispose is new
-        #$sharp('base.Dispose();')
-        $sharp('_innerWriter.Dispose();')
-
+        #sharp'base.Dispose();'
+        #sharp'_innerWriter.Dispose();'
+        _innerWriter.dispose
     
 class IndentedWriter
     inherits TextWriter
@@ -142 +142 @@
     ## Other
 
     def dispose is new
-        #$sharp('base.Dispose();')
-        $sharp('_innerWriter.Dispose();')
-
+        #sharp'base.Dispose();'
+        #sharp'_innerWriter.Dispose();'
+        _innerWriter.dispose
+        
     # *** Private Util ***
 
     def _setTotalIndentString

Source/CobraParser.cobra

@@ -3327 +3327 @@
             on 'SHARP_DOUBLE'
                 assert token.text.startsWith('sharp"')
                 return SharpExpr(token, token.text['sharp"'.length:-1])
-            on 'SHARP_OPEN'
+            on 'SHARP_OPEN' # deprecated 
                 expr = .expression
                 .expect('RPAREN')
+                sharpStr="sharp'...'"
+                _warning('sharp-open expression ("$sharp(...)" deprecated. Please use a sharp string literal instead (sharp"..." or [sharpStr])')
                 return SharpExpr(token, expr)
             else
                 throw FallThroughException(token)

Tests/110-basics-two/502-sharp.cobra

@@ -9 +9 @@
         .oldSyntax
 
     def oldSyntax is shared
-        i as int = $sharp('2+2')
+        i as int = $sharp('2+2') #.warning. deprecated
         assert i==4
-        i = $sharp('i*2')
+        i = $sharp('i*2')   #.warning. deprecated
         assert i==8

Tests/110-basics-two/100-using.cobra

@@ -10 +10 @@
             buffer = StringWriter()
             using sr = File.openText(path)
                 print to buffer, sr.readLine
-            assert $sharp('sr == null')  # assert sharp is nil
+            assert sharp'sr == null'  # assert sharp is nil
             assert buffer.toString.length

Tests/110-basics-two/101-using.cobra

@@ -14 +14 @@
     def main is shared
         using sr = File.openText(.fileName)
             print sr.readLine
-        assert $sharp('sr == null') # assert sr is nil
+        assert sharp'sr == null' # assert sr is nil
         using sr = File.openText(.fileName)
             print sr.readLine
-        assert $sharp('sr == null') # assert sr is nil
+        assert sharp'sr == null' # assert sr is nil
         Test().useClassVar
 
     var _tr as TextReader?
@@ -27 +27 @@
         using _tr = File.openText(.fileName)
             assert _tr is not nil
             print _tr.readLine
-        assert $sharp('_tr == null') # assert _tr is nil
+        assert sharp'_tr == null' # assert _tr is nil

Developer/IntermediateReleaseNotes.text

@@ -469 +469 @@
 * Fixed: The expression `nil is x`, where `x` is a nilable type, generates a false error message.
 
 * Fixed: Only the last `test` of a series of tests is included in the compiler's output.
+
+* Generate warning on use of deprecated "$sharp('...')" syntax in favor of newer alternate sharp-string-literal form: sharp'...' and sharp"..."