From 196ef12199fa1cb7aed6e4c04bacce3ed55860ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=9F=D0=BE=D0=B3=D0=BE=D1=80=D0=B5=D0=BB=D0=BE=D0=B2?=
 <deadgirlneversayno@rambler.ru>
Date: Fri, 24 May 2019 09:44:15 +0300
Subject: [PATCH] Merge master[4]

---
 TestSuite/formatter_tests/input/pattern2.pas  | 46 -------------------
 TestSuite/formatter_tests/input/pattern3.pas  |  7 ---
 TestSuite/formatter_tests/should/pattern2.pas | 46 -------------------
 TestSuite/formatter_tests/should/pattern3.pas |  7 ---
 4 files changed, 106 deletions(-)
 delete mode 100644 TestSuite/formatter_tests/input/pattern2.pas
 delete mode 100644 TestSuite/formatter_tests/input/pattern3.pas
 delete mode 100644 TestSuite/formatter_tests/should/pattern2.pas
 delete mode 100644 TestSuite/formatter_tests/should/pattern3.pas

diff --git a/TestSuite/formatter_tests/input/pattern2.pas b/TestSuite/formatter_tests/input/pattern2.pas
deleted file mode 100644
index 2791c637f..000000000
--- a/TestSuite/formatter_tests/input/pattern2.pas
+++ /dev/null
@@ -1,46 +0,0 @@
-type
-  CardInfo = auto class
-  public 
-    cardNumber: string;
-    cv: integer;
-  end;
-  
-  Person = class
-  
-  public 
-    name: string;
-    age: integer;
-    card: CardInfo;
-    
-    constructor(name: string; age: integer; card: CardInfo);
-    begin
-      self.name := name;
-      self.age := age;
-      self.card := card;
-    end;
-    
-    procedure Deconstruct(var name: string; var age: integer; var card: CardInfo);
-    begin
-      name := self.name;
-      age := self.age;
-      card := self.card;
-    end;
-  end;
-
-begin
-  var p1 := new Person('Вася', 11, new CardInfo('12345671', 321));
-  var p2 := new Person('Петя', 12, new CardInfo('12345672', 322));
-  var p3 := new Person('Маша', 13, new CardInfo('12345673', 323));
-  var personArr := Arr(p1, p2, p3);
-  
-  // Расширенный is
-  if personArr is [  Person(name1  ,   11, CardInfo(   _, cv)),   _, Person(   name2,   13,    _)] then 
-    assert(name1.Equals('Вася') and (cv = 321) and name2.Equals('Маша'));
-  
-  // match .. with
-  match personArr with
-    [   _, _, Person('Вася',    var age, _)]: assert(false);
-    [   var p, ..    , Person('Маша',    _,   _)]: assert((p as Person).name.Equals('Вася'));
-    [    ..   ]: assert(false); 
-  end;
-end.
\ No newline at end of file
diff --git a/TestSuite/formatter_tests/input/pattern3.pas b/TestSuite/formatter_tests/input/pattern3.pas
deleted file mode 100644
index a6b1866b9..000000000
--- a/TestSuite/formatter_tests/input/pattern3.pas
+++ /dev/null
@@ -1,7 +0,0 @@
-begin
-  match ( 1, 2, 'string'   ) with
-    (  1, _, 'str'  ): assert(false); 
-    (  1, _, 'strin'): assert(false);
-    (  _, _, 'string'): ;
-  end;
-end.
\ No newline at end of file
diff --git a/TestSuite/formatter_tests/should/pattern2.pas b/TestSuite/formatter_tests/should/pattern2.pas
deleted file mode 100644
index f105d5900..000000000
--- a/TestSuite/formatter_tests/should/pattern2.pas
+++ /dev/null
@@ -1,46 +0,0 @@
-type
-  CardInfo = auto class
-  public 
-    cardNumber: string;
-    cv: integer;
-  end;
-  
-  Person = class
-  
-  public 
-    name: string;
-    age: integer;
-    card: CardInfo;
-    
-    constructor(name: string; age: integer; card: CardInfo);
-    begin
-      self.name := name;
-      self.age := age;
-      self.card := card;
-    end;
-    
-    procedure Deconstruct(var name: string; var age: integer; var card: CardInfo);
-    begin
-      name := self.name;
-      age := self.age;
-      card := self.card;
-    end;
-  end;
-
-begin
-  var p1 := new Person('Вася', 11, new CardInfo('12345671', 321));
-  var p2 := new Person('Петя', 12, new CardInfo('12345672', 322));
-  var p3 := new Person('Маша', 13, new CardInfo('12345673', 323));
-  var personArr := Arr(p1, p2, p3);
-  
-  // Расширенный is
-  if personArr is [Person(name1, 11, CardInfo(_, cv)), _, Person(name2, 13, _)] then 
-    assert(name1.Equals('Вася') and (cv = 321) and name2.Equals('Маша'));
-  
-  // match .. with
-  match personArr with
-    [_, _, Person('Вася', var age, _)]: assert(false);
-    [var p, .., Person('Маша', _, _)]: assert((p as Person).name.Equals('Вася'));
-    [..]: assert(false); 
-  end;
-end.
\ No newline at end of file
diff --git a/TestSuite/formatter_tests/should/pattern3.pas b/TestSuite/formatter_tests/should/pattern3.pas
deleted file mode 100644
index 6a59f2d67..000000000
--- a/TestSuite/formatter_tests/should/pattern3.pas
+++ /dev/null
@@ -1,7 +0,0 @@
-begin
-  match (1, 2, 'string') with
-    (1, _, 'str'): assert(false); 
-    (1, _, 'strin'): assert(false);
-    (_, _, 'string'): ;
-  end;
-end.
\ No newline at end of file