From 3f01d854f385fa57e87366de66215d933fe9811c Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@users.sourceforge.net>
Date: Wed, 21 Oct 2009 14:49:35 +0200
Subject: [PATCH] Added continuation lines in produced Fortran Version:1.1.34

---
 .gitignore               | 10 ++++++++++
 example/input.irp.f      |  3 +++
 src/makefile.py          |  2 +-
 src/preprocessed_text.py |  6 +++---
 src/util.py              | 10 ++++++----
 src/version.py           |  2 +-
 6 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ef7cd62
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+packages/.rpmmacros
+packages/*.tar.gz
+packages/*.rpm
+packages/sourceforge.sh
+packages/version
+src/*.pyc
+irpf90.make
+irpf90_entities
+IRPF90_temp
+IRPF90_man
diff --git a/example/input.irp.f b/example/input.irp.f
index e41611b..2eee5bf 100644
--- a/example/input.irp.f
+++ b/example/input.irp.f
@@ -12,5 +12,8 @@ for i in range(1,6):
     print "  ASSERT ( d%d > d%d )"%(i,i-1)
  END_SHELL
 
+ print *,  &
+  'ceci est un ' &
+  //'test'
 END_PROVIDER
 
diff --git a/src/makefile.py b/src/makefile.py
index bb702fe..c6736bc 100644
--- a/src/makefile.py
+++ b/src/makefile.py
@@ -43,7 +43,7 @@ def create():
   file = open(FILENAME,"w")
   t = """IRPF90 = irpf90  #-a -d
 FC     = gfortran
-FCFLAGS= -ffree-line-length-none -O2
+FCFLAGS= -O2
 
 SRC=
 OBJ=
diff --git a/src/preprocessed_text.py b/src/preprocessed_text.py
index cdd30c0..9bb3c5f 100644
--- a/src/preprocessed_text.py
+++ b/src/preprocessed_text.py
@@ -304,14 +304,14 @@ def remove_continuation(text,form):
   if form == Free_form:
     for line in text:
       if line.text[-1] == '&':
-        buffer = "%s%s "%(buffer,line.text[:-1].lstrip())
+        buffer = "%s%s\n"%(buffer,line.text)
         if number == 0:
           t = type(line)
           number = line.i
       else:
         if number != 0:
           newline = t(number, \
-            "%s%s"%(buffer,line.text.lstrip()), \
+            "%s%s"%(buffer,line.text), \
             line.filename)
           line = newline
           number = 0
@@ -327,7 +327,7 @@ def remove_continuation(text,form):
           if line.text[5] != ' ':
             is_continuation = True
       if is_continuation:
-         buffer = "%s %s"%(line.text[6:].lstrip(),buffer)
+         buffer = "&\n%s %s %s"%(line.text[:5],line.text[6:],buffer)
       else:
          line.text = line.text+buffer
          result.insert(0,line)
diff --git a/src/util.py b/src/util.py
index 1aa8ab4..5f2c182 100644
--- a/src/util.py
+++ b/src/util.py
@@ -39,12 +39,14 @@ def same_file(filename,txt):
     file = open(filename,"r")
   except IOError:
     return False
-  lines = file.readlines()
+  stream = file.read()
   file.close()
-  if len(lines) != len(txt):
+
+  buffer = ''.join(txt)
+ 
+  if len(stream) != len(buffer):
     return False
-  for a,b in zip(lines,txt):
-    if a != b:
+  if stream != buffer:
       return False
   return True
 
diff --git a/src/version.py b/src/version.py
index 504db19..abbbfac 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1 +1 @@
-version = "1.1.31"
+version = "1.1.34"