[FLANG][OPENMP] Resolved nitpicks and added missing ampersand check.

Author: Karthikdhondi

flang/lib/Parser/prescan.cpp

@@ -1297,7 +1297,7 @@ const char *Prescanner::FreeFormContinuationLine(bool ampersand) {
           return nullptr;
         }
       }
-    } else if (features_.IsEnabled(LanguageFeature::OpenMP)) {
+    } else if (features_.IsEnabled(LanguageFeature::OpenMP) && *p == '$') {
       ++p;
     } else {
       return nullptr;

flang/test/Parser/compiler-directive_continuation.f90 renamed to flang/test/Parser/OpenMP/compiler-directive-continuation.f90

@@ -1,5 +1,5 @@
-! RUN: flang-new -fopenmp -E %s 2>&1 | FileCheck %s --check-prefix=CHECK-OMP
-! RUN: flang-new -E %s 2>&1 | FileCheck %s 
+! RUN: %flang_fc1 -fopenmp -E %s 2>&1 | FileCheck %s --check-prefix=CHECK-OMP
+! RUN: %flang_fc1 -E %s 2>&1 | FileCheck %s 
 
 
 ! Test in mixed way, i.e., combination of Fortran free source form 
@@ -18,10 +18,10 @@ subroutine mixed_form1()
 
 
 ! Testing continuation lines in only Fortran Free form Source
-! CHECK-LABEL: subroutine mixed_form3()
+! CHECK-LABEL: subroutine mixed_form2()
 ! CHECK-OMP: i = 1 +10 +100 + 1000 + 10000
 ! CHECK: i = 1 +10 +100 + 1000 + 10000
-subroutine mixed_form3()
+subroutine mixed_form2()
    i = 1 &
    +10 &
    &+100
@@ -31,10 +31,10 @@ subroutine mixed_form3()
 
 
 ! Testing continuation line in only free source form conditional compilation sentinel.
-! CHECK-LABEL: subroutine mixed_form4()
+! CHECK-LABEL: subroutine mixed_form3()
 ! CHECK-OMP: i=0
 ! CHECK-OMP: i = 1 +10 +100+1000
-subroutine mixed_form4()
+subroutine mixed_form3()
    !$ i=0
    !$ i = 1 &
    !$ & +10 &