Update

Author: odow

docs/src/submodules/FileFormats/LP.md

@@ -38,14 +38,14 @@ In addition to the grammar, there are the following rules:
 
 ```
 <lp-file> :== 
-    <keyword-objective>
-    [<section-objective>]
-    <keyword-constraints>
+    <keyword-objective>\n
+    [<section-objective>\n]
+    <keyword-constraints>\n
     (<constraint>)*
-    [<keyword-bounds> (<bound-expression>)+]
-    [<keyword-general> (<identifier>)+]
-    [<keyword-binary> (<identifier>)+]
-    [<keyword-sos> (<constraint-sos>)+]
+    [<keyword-bounds>\n (<bound-expression>)+]
+    [<keyword-general>\n (<identifier>)+]
+    [<keyword-binary>\n (<identifier>)+]
+    [<keyword-sos>\n (<constraint-sos>)+]
     [<keyword-end>]
 
 <keyword-objective> :==

src/FileFormats/LP/read.jl

@@ -29,13 +29,6 @@ struct _ReadCache{T}
     end
 end
 
-function _read_newline_or_eof(state)
-    if (p = peek(state, _Token)) !== nothing
-        _ = read(state, _Token, _TOKEN_NEWLINE)
-    end
-    return
-end
-
 """
     Base.read!(io::IO, model::FileFormats.LP.Model)
 
@@ -60,7 +53,6 @@ function Base.read!(io::IO, model::Model{T}) where {T}
         if token.kind == _TOKEN_KEYWORD
             _ = read(state, _Token)
             keyword = Symbol(token.value)
-            _read_newline_or_eof(state)
         elseif token.kind == _TOKEN_NEWLINE
             _ = read(state, _Token, _TOKEN_NEWLINE)
         elseif keyword == :MINIMIZE
@@ -884,7 +876,6 @@ function _parse_objective(state::_LexerState, cache::_ReadCache)
     end
     f = _parse_expression(state, cache)
     MOI.set(cache.model, MOI.ObjectiveFunction{typeof(f)}(), f)
-    _read_newline_or_eof(state)
     return
 end
 
@@ -931,7 +922,6 @@ function _parse_bound_expression(state, cache)
         x = _parse_identifier(state, cache)
         set = _parse_set_suffix(state, cache)
         _add_bound(cache, x, set)
-        _read_newline_or_eof(state)
         return
     end
     # `a op x` or `a op x op b`
@@ -946,7 +936,6 @@ function _parse_bound_expression(state, cache)
         rhs_set = _parse_set_suffix(state, cache)
         _add_bound(cache, x, rhs_set)
     end
-    _read_newline_or_eof(state)
     return
 end
 
@@ -1051,6 +1040,5 @@ function _parse_constraint(state::_LexerState, cache::_ReadCache)
     if name !== nothing
         MOI.set(cache.model, MOI.ConstraintName(), c, name)
     end
-    _read_newline_or_eof(state)
     return
 end

test/FileFormats/LP/LP.jl

@@ -976,8 +976,7 @@ function test_read_newline_breaks()
     + z ==
     0
     Bounds
-    x >= 0
-    -1 <= y
+    x >= 0 -1 <= y
     +1 <= z <= +2
     End
     """
@@ -1540,11 +1539,6 @@ function test_new_line_edge_case_fails()
         "maximize\nobj: x subject to",
         # No new line between subject to and constraint
         "maximize\nobj: x\nsubject to c: x >= 0",
-        # No new line between multiple constraints
-        "maximize\nobj: x\nsubject to\nc: x >= 0 x <= 1",
-        # New lines in bounds section
-        "maximize\nobj: x\nsubject to\nbounds x >= 0\bx <= 1",
-        "maximize\nobj: x\nsubject to\nbounds\nx >= 0 x <= 1",
     ]
         io = IOBuffer(input)
         seekstart(io)