Changeset 1576

Timestamp:

08/13/08 20:17:02 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Cannot use the branch statement if the expression has a dynamic type.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Statements.cobra (modified) (1 diff)
• Tests/500-dynamic/126-dynamic-statements.cobra (modified) (1 diff)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -97 +97 @@
 
 * Fixed: Assignments (and other side effects) can appear in assert conditions even though they might be excluded during compilation or run-time. ticket:4 (hopscc)
+
+* Fixed: Cannot use the `branch` statement if the expression has a dynamic type.

cobra/trunk/Source/Statements.cobra

@@ -293 +293 @@
         def writeSharpDef(sw as SharpWriter)
                 base.writeSharpDef(sw)
-                sw.write('switch(')
-                _expr.writeSharpDef(sw)
-                sw.write(') {\n')
-                sw.indent
-                for onPart in _onParts
-                        sep = ''
-                        for e in onPart.exprs
-                                sw.write(sep)
-                                sw.write('case ')
-                                e.writeSharpDef(sw)
-                                sw.write(': ')
-                                sep = '\n'
-                        onPart.block.writeSharpDef(sw)
-                        if not onPart.block.stmts.count or not onPart.block.stmts[onPart.block.stmts.count-1] inherits ReturnStmt  # CC: use .last
+                if _expr.type.isDynamic
+                        # if the expression is dynamic, then use an if-else ladder with CobraImp.Equals(
+                        sw.writeLine('// branch [_expr.toCobraSource]')
+                        
+                        varName = '_lh_branch_[.serialNum]'
+                        sw.write('[_expr.type.sharpRef] [varName] = ')
+                        _expr.writeSharpDef(sw)
+                        sw.writeLine(';')
+                                                
+                        elseWord = ''
+                        for onPart in _onParts
+                                sw.write('[elseWord]if (')
+                                sep = ''
+                                for e in onPart.exprs
+                                        sw.write(sep)
+                                        sw.write('CobraImp.Equals([varName], ')
+                                        e.writeSharpDef(sw, false)
+                                        sw.write(')')
+                                        sep = ' || '
+                                sw.write(')')
+                                onPart.block.writeSharpDef(sw)
+                                elseWord = 'else '
+                        if _elsePart
+                                sw.write('else ')
+                                _elsePart.writeSharpDef(sw)
+                else
+                        # for any other kind of expression, use a C# switch
+                        sw.write('switch(')
+                        _expr.writeSharpDef(sw)
+                        sw.write(') {\n')
+                        sw.indent
+                        for onPart in _onParts
+                                sep = ''
+                                for e in onPart.exprs
+                                        sw.write(sep)
+                                        sw.write('case ')
+                                        e.writeSharpDef(sw)
+                                        sw.write(': ')
+                                        sep = '\n'
+                                onPart.block.writeSharpDef(sw)
+                                if not onPart.block.stmts.count or not onPart.block.stmts[onPart.block.stmts.count-1] inherits ReturnStmt  # CC: use .last
+                                        sw.write('break;\n')
+                        if _elsePart
+                                sw.write('default: ')
+                                _elsePart.writeSharpDef(sw)
                                 sw.write('break;\n')
-                if _elsePart
-                        sw.write('default: ')
-                        _elsePart.writeSharpDef(sw)
-                        sw.write('break;\n')
-                sw.dedent
-                sw.write('}\n')
+                        sw.dedent
+                        sw.write('}\n')
 
 

cobra/trunk/Tests/500-dynamic/126-dynamic-statements.cobra

@@ -176 +176 @@
                         x += 1
                 assert x == 10
+
+
+                # branch
+
+                assert .nameOf(1) == 'one'
+                assert .nameOf(2) == 'two'
+                assert .nameOf(3) == 'a few'
+                assert .nameOf(4) == 'a few'
+                assert .nameOf(5) == 'many'
+
+                assert .nameOf(1.0d) == 'one'
+                assert .nameOf(2.0d) == 'two'
+                assert .nameOf(3.0d) == 'a few'
+                assert .nameOf(4.0d) == 'a few'
+                assert .nameOf(5.0d) == 'many'
+        
+
+        def nameOf(i as dynamic) as String
+                branch i
+                        on 1, return 'one'
+                        on 2, return 'two'
+                        on 3 or 4, return 'a few'
+                        else, return 'many'
+                return ''