changeset 655:36c10a09ad84

[add] Feature Request ID 2498654 : Added support for the Fortran indenter F90ppr. http://universalindent.sf.net/issue/2498654 git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@915 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Fri, 06 Feb 2009 14:12:39 +0000
parents 68b44fb0c0ce
children cd73fb26dfb0
files CHANGELOG.txt indenters/example.f90 indenters/uigui_f90ppr.ini src/UiGuiHighlighter.cpp
diffstat 4 files changed, 55 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG.txt	Fri Feb 06 14:11:25 2009 +0000
+++ b/CHANGELOG.txt	Fri Feb 06 14:12:39 2009 +0000
@@ -1,4 +1,6 @@
-2009-02-04 Version 1.0.2
+2009-02-05 Version 1.0.2
+[add] Feature Request ID 2498654 : Added support for the Fortran indenter F90ppr. http://universalindent.sf.net/issue/2498654
+[add] Made it possible to define "stdin" to be used for an indenter calling.
 [change] Made the source code be compilable with the slightly older QScintilla version 2.2.
 [change] When starting the very first time without any existing application settings, do not show the mainwindow at position 0,0. On Mac the window couldn't be moved because the window title bar was hidden under the Mac menu bar.
 [change] When using a non Windows system the default editor font type is now Monospace instead of Courier. The latter was not found properly.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/indenters/example.f90	Fri Feb 06 14:12:39 2009 +0000
@@ -0,0 +1,33 @@
+module module1
+!  Identity of a utility
+! ____________________________________________________________________
+      character (len=*), parameter :: xyz = &
+"I am just a more or less long string."
+      character (len=*), parameter :: zhlp  = '( &
+&"This program is free software; you can redistribute it and/or modify"/&
+&"____________________________________________________________________")'
+integer:: n
+contains
+
+recursive subroutine sub1(x)
+integer,intent(inout):: x
+integer:: y
+y=0
+if (x<n) then
+ x= x + 1
+ y =x**2
+ print *, 'x = ', x,', y = ', y
+ call sub1(x)
+ print *, 'x = ', x,', y = ', y
+end if
+end subroutine sub1
+
+end module module1
+
+program main
+use module1
+integer:: x = 0
+print *, 'Enter number of repeats'
+read (*,*) n
+call sub1(x)
+end program main
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/indenters/uigui_f90ppr.ini	Fri Feb 06 14:12:39 2009 +0000
@@ -0,0 +1,17 @@
+[header]
+categories=
+cfgFileParameterEnding=
+configFilename=
+fileTypes=*.f90
+indenterFileName=f90ppr.exe
+indenterName=Fortran 90 PPR (Fortran)
+inputFileName=indentinput
+inputFileParameter="< "
+manual=ftp://ftp.ifremer.fr/ifremer/ditigo/fortran90/
+outputFileName=
+outputFileParameter=stdout
+parameterOrder=pio
+showHelpParameter=
+stringparaminquotes=false
+useCfgFileParameter=
+version=1.3
--- a/src/UiGuiHighlighter.cpp	Fri Feb 06 14:11:25 2009 +0000
+++ b/src/UiGuiHighlighter.cpp	Fri Feb 06 14:12:39 2009 +0000
@@ -51,7 +51,7 @@
     mapHighlighternameToExtension["D"] = QStringList() << "d";
     mapHighlighternameToExtension["Diff"] = QStringList() << "diff";
 #if ( QSCINTILLA_VERSION >= 0x020300 )
-    mapHighlighternameToExtension["Fortran"] = QStringList() << "f" << "for";
+    mapHighlighternameToExtension["Fortran"] = QStringList() << "f" << "for" << "f90";
     mapHighlighternameToExtension["Fortran77"] = QStringList() << "f77";
 #endif
     mapHighlighternameToExtension["HTML"] = QStringList() << "html" << "htm";
@@ -359,7 +359,7 @@
         lexer = new QsciLexerDiff();
     }
 #if ( QSCINTILLA_VERSION >= 0x020300 )
-    else if ( extension == "f" || extension == "for" ) {
+    else if ( extension == "f" || extension == "for" || extension == "f90" ) {
         lexer = new QsciLexerFortran();
     }
     else if ( extension == "f77" ) {