From b32558e3fb7021bb7fe2af311aaa535c79fc5637 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Wed, 6 May 2020 15:17:22 -0400 Subject: Fixed stream io under non-Windows systems. Updated non-Windows project. --- files.f90 | 3 +++ gemini.prj | 29 ++++++++++++++++++++++------- layout.f90 | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/files.f90 b/files.f90 index 0ca43a6..b30c436 100644 --- a/files.f90 +++ b/files.f90 @@ -50,6 +50,9 @@ contains allocate(character(len=length) :: res) res = repeat(' ', length) + ! Rewind seems necessary, especially on non-Windows... + rewind(unit_number) + read(unit_number, '(A1)', pos=startpos, advance='no', iostat=iostatus) c if(iostatus == 0) then res(1:1) = c diff --git a/gemini.prj b/gemini.prj index 8306deb..48e0ba7 100644 --- a/gemini.prj +++ b/gemini.prj @@ -14,32 +14,47 @@ "filename":"jessl.f90", "enabled":"1" },{ - "filename":"network.f90", + "filename":"network.F90", "enabled":"1" },{ "filename":"test_ssl.f90", - "enabled":"1" + "enabled":"0" }] }], - "Name":"+gemini (target.exe)", + "Name":"+gemini (target)", "Files":[{ "filename":"dumb_render.f90", "enabled":"1" + },{ + "filename":"escape.f90", + "enabled":"1" },{ "filename":"files.f90", "enabled":"1" + },{ + "filename":"history.f90", + "enabled":"1" },{ "filename":"layout.f90", "enabled":"1" + },{ + "filename":"main.F90", + "enabled":"1" + },{ + "filename":"protocol.f90", + "enabled":"1" },{ "filename":"render.f90", "enabled":"1" + },{ + "filename":"request.f90", + "enabled":"1" },{ "filename":"test.f90", "enabled":"0" }] }, - "Name":"gemini (target.exe)", + "Name":"gemini (target)", "Options":{ "Compiler Options":{ "Fortran Flags":"", @@ -56,7 +71,7 @@ "Module Directory":"modules", "Include Directories":["Default Add-On Include Directory"] }, - "Target":"target.exe", + "Target":"target", "Fortran Options":{ "Use C Preprocessor":"false", "Runtime Diagnostics":"false", @@ -79,7 +94,7 @@ "Launch Using MPI":"false", "Keep Console":"true", "External Console":"false", - "Command Line Arguments":"-g samples\\sample1.gmi", + "Command Line Arguments":"", "Build Before Launch":"true" }, "Build Options":{ @@ -87,7 +102,7 @@ "Auto Makefile":"true" }, "Linker Options":{ - "Static Linking Mode":7, + "Static Linking Mode":0, "Link MPI Library":"false", "Link LAPACK":0 } diff --git a/layout.f90 b/layout.f90 index 9a3797b..403f644 100644 --- a/layout.f90 +++ b/layout.f90 @@ -31,6 +31,7 @@ contains call rendering_engine%prepare_for_layout() do while(laying_out) + select case (walker%line_type) case (line_type_text) -- cgit v1.2.3