Corrections to Fortran snippets (honza#783)

* Some correction

* Necessary corrections to if and do constructs

I'm trying to make separate branches for commits related to different snippet files. This commit only affects fortra.snippets.

* A modification to arr snippet

Modified the arr snippets for array in such a way that the second tabstop can be used to remove the allocatable attribute.

* Fixed the tabular snippet

Corrected the tabular snippet (also the one in the table snippet) in order to get the correct number of ampersands even for a non-central first column

Author: Enrico Maria De Angelis

UltiSnips/tex.snippets

@@ -10,7 +10,7 @@ endsnippet
 
 snippet tab "tabular / array environment" b
 \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
-$0${2/((?<=.)c|l|r)|./(?1: & )/g}
+$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
@@ -20,7 +20,7 @@ snippet table "Table environment" b
 	\caption{${2:caption}}
 	\label{tab:${3:label}}
 	\begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}}
-	$0${5/((?<=.)c|l|r)|./(?1: & )/g}
+	$0${5/(?<=.)(c|l|r)|./(?1: & )/g}
 	\end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 \end{table}
 endsnippet

snippets/fortran.snippets

@@ -49,15 +49,15 @@ snippet type
 snippet const
 	${1:type}, parameter :: $2 = $0
 snippet arr
-	${1:type}, allocatable, dimension(${2::}) :: $0
+	${1:type}, ${2:allocatable, }dimension(${3::}) :: $0
 snippet intent
 	${1:type}, intent(inout) :: $0
 # Array
 snippet /
 	(/ $1 /) ${2:,&} $0
 snippet if
 	if (${1:condition}) then
-		$2
+		$0
 	end if
 snippet case
 	select case (${1:expr})
@@ -66,8 +66,8 @@ snippet case
 			$3
 	end select $0
 snippet do
-	do ${1:i} = ${2:start},${3:end}, ${4:incr}
-		$4
+	do ${1:i} = ${2:start}, ${3:end}, ${4:incr}
+		$0
 	end do
 snippet dow
 	do while (${1:condition})
@@ -84,10 +84,10 @@ snippet func
 snippet pr
 	write(*,*) $0
 snippet read
-	read( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+	read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
 snippet write
-	write( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+	write(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
 snippet open
-	open (unit = ${1:fp}, file = ${2:filename}, status = unknown${3:, iostat = IERR }) $0
+	open(unit = ${1:fp}, file = ${2:filename}, status = ${3:unknown}, iostat = ${4:ierr}) $0
 snippet close
-	close ( unit = ${1:fp} ) $0
+	close(unit = ${1:fp}) $0