Replace some _otherwise occurrences

examples/src/main/scala/soda/example/ethicalissues/pricemonitor/Package.scala

@@ -231,9 +231,9 @@ trait SegmentsForFlight
   def rec_segments_multi (first_airport : String) (intermediate_stops : Seq [String] )
       (last_airport : String) : Seq [Segment] =
     intermediate_stops match  {
-      case head :: tail => (rec_segments_multi (head) (tail) (last_airport) ) .+: (
+      case Nil => Nil .+: (Segment_ (first_airport , last_airport) )
+      case head +: tail => (rec_segments_multi (head) (tail) (last_airport) ) .+: (
         Segment_ (first_airport , head) )
-      case _otherwise => Nil .+: (Segment_ (first_airport , last_airport) )
     }
 
   lazy val segments : Seq [Segment] =

examples/src/main/scala/soda/example/ethicalissues/pricemonitor/Requirement3Monitor.soda

@@ -28,9 +28,9 @@ class SegmentsForFlight
   rec_segments_multi (first_airport : String) (intermediate_stops : Seq [String] )
       (last_airport : String) : Seq [Segment] =
     match intermediate_stops
-      case head :: tail ==> (rec_segments_multi (head) (tail) (last_airport) ) .+: (
+      case Nil ==> Nil .+: (Segment_ (first_airport , last_airport) )
+      case head +: tail ==> (rec_segments_multi (head) (tail) (last_airport) ) .+: (
         Segment_ (first_airport , head) )
-      case _otherwise ==> Nil .+: (Segment_ (first_airport , last_airport) )
 
   segments : Seq [Segment] =
     rec_segments_multi (flight .start_airport) (flight .intermediate_airports) (

examples/src/main/scala/soda/example/forcoq/lib/List.soda

@@ -39,8 +39,8 @@ class SeqList
   @tailrec
   _tailrec_from_Seq [A : Type] (a : Seq [A] ) (b : list [A] ) : list [A] =
     match a
+      case Nil ==> b
       case (e) :: (s) ==> _tailrec_from_Seq (s) (cons_ (e , b) )
-      case _otherwise ==> b
 
   from_Seq [A : Type] (a : Seq [A] ) : list [A] =
     reverse (_tailrec_from_Seq (a) (nil_ [A] () ) )

examples/src/main/scala/soda/example/forcoq/lib/Package.scala

@@ -73,8 +73,8 @@ trait SeqList
         @tailrec  final
   private def _tailrec_from_Seq [A ] (a : Seq [A] ) (b : list [A] ) : list [A] =
     a match  {
+      case Nil => b
       case (e) :: (s) => _tailrec_from_Seq (s) (cons_ (e , b) )
-      case _otherwise => b
     }
 
   def from_Seq [A ] (a : Seq [A] ) : list [A] =

translator/src/main/resources/lib/soda/lib/OptionSD.soda

@@ -114,7 +114,7 @@ class OptionSDBuilder [A : Type]
   build (option : Option [A] ) : OptionSD [A] =
     match option
       case Some (content) ==> SomeSD_ [A] (content)
-      case _otherwise ==> NoneSD_ [A] ()
+      case None ==> NoneSD_ [A] ()
 
 end
 

translator/src/main/resources/lib/soda/lib/Package.scala

@@ -265,7 +265,7 @@ trait OptionSDBuilder [A ]
   def build (option : Option [A] ) : OptionSD [A] =
     option match  {
       case Some (content) => SomeSD_ [A] (content)
-      case _otherwise => NoneSD_ [A] ()
+      case None => NoneSD_ [A] ()
     }
 
 }

translator/src/main/resources/soda/translator/documentation/Manual.soda

@@ -260,7 +260,7 @@ class Manual
   if_then_else [A : Type] (condition : Boolean) (if_true : A) (if_false : A) : A =
     match condition
       case true ==> if_true
-      case _otherwise ==> if_false
+      case false ==> if_false
 
   /* A constant or function name starting with underscore indicates that the constant or
    * function is private, and therefore is not visible outside the class. */

translator/src/main/scala/soda/lib/OptionSD.soda

@@ -114,6 +114,6 @@ class OptionSDBuilder [A : Type]
   build (option : Option [A] ) : OptionSD [A] =
     match option
       case Some (content) ==> SomeSD_ [A] (content)
-      case _otherwise ==> NoneSD_ [A] ()
+      case None ==> NoneSD_ [A] ()
 
 end

translator/src/main/scala/soda/lib/Package.scala

@@ -265,7 +265,7 @@ trait OptionSDBuilder [A ]
   def build (option : Option [A] ) : OptionSD [A] =
     option match  {
       case Some (content) => SomeSD_ [A] (content)
-      case _otherwise => NoneSD_ [A] ()
+      case None => NoneSD_ [A] ()
     }
 
 }

translator/src/main/scala/soda/translator/blocktr/DirectiveBlockTranslator.soda

@@ -17,13 +17,13 @@ class DirectiveBlockTranslator
 
   _get_first_or_empty (sequence : Seq [String] ) : String =
     match sequence
-      case x :: xs ==> x
-      case _otherwise ==> ""
+      case x +: xs ==> x
+      case Nil ==> ""
 
   _remove_first_if_possible (sequence : Seq [String] ) : Seq [String] =
     match sequence
-      case x :: xs ==> xs
-      case _otherwise ==> sequence
+      case x +: xs ==> xs
+      case Nil ==> sequence
 
   _comment_block_out (lines : Seq [String] ) : Seq [String] =
     Seq (opening_comment) .++ (lines .++ (Seq (closing_comment) ) )

translator/src/main/scala/soda/translator/blocktr/Package.scala

@@ -27,14 +27,14 @@ trait DirectiveBlockTranslator
 
   private def _get_first_or_empty (sequence : Seq [String] ) : String =
     sequence match  {
-      case x :: xs => x
-      case _otherwise => ""
+      case x +: xs => x
+      case Nil => ""
     }
 
   private def _remove_first_if_possible (sequence : Seq [String] ) : Seq [String] =
     sequence match  {
-      case x :: xs => xs
-      case _otherwise => sequence
+      case x +: xs => xs
+      case Nil => sequence
     }
 
   private def _comment_block_out (lines : Seq [String] ) : Seq [String] =

translator/src/main/scala/soda/translator/io/DirectoryScanner.soda

@@ -32,7 +32,7 @@ class DirectoryScanner
   _list_files_with (files : Option [Array [File] ] ) : Seq [File] =
     match files
       case Some (array) ==> array .toSeq
-      case _otherwise ==> Seq ()
+      case None ==> Seq ()
 
   _list_files (to_scan_head : File) : Seq [File] =
     _list_files_with (Option (to_scan_head .listFiles) )

translator/src/main/scala/soda/translator/io/Package.scala

@@ -155,7 +155,7 @@ trait DirectoryScanner
   private def _list_files_with (files : Option [Array [File] ] ) : Seq [File] =
     files match  {
       case Some (array) => array .toSeq
-      case _otherwise => Seq ()
+      case None => Seq ()
     }
 
   private def _list_files (to_scan_head : File) : Seq [File] =

translator/src/main/scala/soda/translator/parser/annotation/DirectiveBlockAnnotation.soda

@@ -17,8 +17,8 @@ class DirectiveBlockAnnotation
 
   _get_first_line_or_empty (annotated_lines : Seq [AnnotatedLine] ) : String =
     match annotated_lines
-      case x :: xs ==> x .line
-      case _otherwise ==> ""
+      case x +: xs ==> x .line
+      case Nil ==> ""
 
   applies : Boolean =
     (_get_first_line_or_empty (block .readable_lines) .trim + _sc .space)

translator/src/main/scala/soda/translator/parser/annotation/Package.scala

@@ -371,8 +371,8 @@ trait DirectiveBlockAnnotation
 
   private def _get_first_line_or_empty (annotated_lines : Seq [AnnotatedLine] ) : String =
     annotated_lines match  {
-      case x :: xs => x .line
-      case _otherwise => ""
+      case x +: xs => x .line
+      case Nil => ""
     }
 
   lazy val applies : Boolean =

translator/src/test/resources/soda/translator/documentation/Manual.scala

@@ -356,7 +356,7 @@ trait Manual
   def if_then_else [A ] (condition : Boolean) (if_true : A) (if_false : A) : A =
     condition match  {
       case true => if_true
-      case _otherwise => if_false
+      case false => if_false
     }
 
   /* A constant or function name starting with underscore indicates that the constant or

translator/src/test/resources/soda/translator/documentation/Manual.soda

@@ -260,7 +260,7 @@ class Manual
   if_then_else [A : Type] (condition : Boolean) (if_true : A) (if_false : A) : A =
     match condition
       case true ==> if_true
-      case _otherwise ==> if_false
+      case false ==> if_false
 
   /* A constant or function name starting with underscore indicates that the constant or
    * function is private, and therefore is not visible outside the class. */

translator/src/test/resources/soda/translator/documentation/Manual.tex

@@ -470,7 +470,7 @@
   if_then_else [A : Type] (condition : Boolean) (if_true : A) (if_false : A) : A =
     match condition
       case true ==> if_true
-      case _otherwise ==> if_false
+      case false ==> if_false
 
 
 \end{lstlisting}

translator/src/test/resources/soda/translator/example/ethicalissues/pricemonitor/Requirement3Monitor.soda

@@ -28,9 +28,9 @@ class SegmentsForFlight
   rec_segments_multi (first_airport : String) (intermediate_stops : Seq [String] )
       (last_airport : String) : Seq [Segment] =
     match intermediate_stops
-      case head :: tail ==> (rec_segments_multi (head) (tail) (last_airport) ) .+: (
+      case Nil ==> Nil .+: (Segment_ (first_airport , last_airport) )
+      case head +: tail ==> (rec_segments_multi (head) (tail) (last_airport) ) .+: (
         Segment_ (first_airport , head) )
-      case _otherwise ==> Nil .+: (Segment_ (first_airport , last_airport) )
 
   segments : Seq [Segment] =
     rec_segments_multi (flight .start_airport) (flight .intermediate_airports) (

translator/src/test/resources/soda/translator/example/forcoq/lib/List.soda

@@ -39,8 +39,8 @@ class SeqList
   @tailrec
   _tailrec_from_Seq [A : Type] (a : Seq [A] ) (b : list [A] ) : list [A] =
     match a
+      case Nil ==> b
       case (e) :: (s) ==> _tailrec_from_Seq (s) (cons_ (e , b) )
-      case _otherwise ==> b
 
   from_Seq [A : Type] (a : Seq [A] ) : list [A] =
     reverse (_tailrec_from_Seq (a) (nil_ [A] () ) )