Skip to content

fix: check for out-of-field sign chars and QUADOBJ/QMATRIX field parsing #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-r-cox merged 3 commits into from
Mar 20, 2026
Merged

fix: check for out-of-field sign chars and QUADOBJ/QMATRIX field parsing #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64e7896
fix: check for out-of-field sign chars
david-r-cox Nov 10, 2025
b8465ea
fix: use fixed-format field positions for QUADOBJ/QMATRIX parsing
david-r-cox Mar 20, 2026
c9e9405
build: update flake inputs and migrate to apple-sdk_15
david-r-cox Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
];

buildDependencies = lib.optionals pkgs.stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
pkgs.apple-sdk_15
];

mps = naersk'.buildPackage {
Expand Down
136 changes: 104 additions & 32 deletions src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,23 +509,44 @@ impl<'a, T: FastFloat> Parser<'a, T> {

// Try strict field positioning first (no comment stripping for strict parsing)
let strict_result = (|| -> Result<WideLine<T>> {
// Extract value string and check if we might be missing a negative sign
let val_str = line_str.get(L4..R4).ok_or_eyre("")?.trim();

// Check character just before L4 to ensure we're not missing a sign
// If L4 > 0 and the char at L4-1 is '-', we're probably misaligned
if L4 > 0 && line_str.len() > L4 {
if let Some(prev_char) = line_str.chars().nth(L4 - 1) {
if prev_char == '-' || prev_char == '+' {
// Sign character right before our field - reject strict parsing
return Err(eyre!(
"potential sign character excluded from value field"
));
}
}
}

let first_pair = RowValuePair {
row_name: line_str.get(L3..R3).ok_or_eyre("")?.trim(),
value: fast_float2::parse(
line_str.get(L4..R4).ok_or_eyre("")?.trim(),
)?,
value: fast_float2::parse(val_str)?,
};
let second_pair = match line_str.get(L5..R5) {
Some(row_name) => {
let row_name = row_name.trim();
if row_name.is_empty() {
None
} else {
// Check for sign before second value too
let val2_str = line_str.get(L6..R6).ok_or_eyre("")?.trim();
if L6 > 0 && line_str.len() > L6 {
if let Some(prev_char) = line_str.chars().nth(L6 - 1) {
if prev_char == '-' || prev_char == '+' {
return Err(eyre!("potential sign character excluded from second value field"));
}
}
}
Some(RowValuePair {
row_name,
value: fast_float2::parse(
line_str.get(L6..R6).ok_or_eyre("")?.trim(),
)?,
value: fast_float2::parse(val2_str)?,
})
}
}
Expand Down Expand Up @@ -890,23 +911,48 @@ impl<'a, T: FastFloat> Parser<'a, T> {

/// Parse bounds line using strict field positioning
fn parse_bounds_strict(line: Span) -> Result<BoundsLine<T>> {
let length = line.len();
let bound_type = BoundType::try_from(line.get(L1..R1).ok_or_eyre("")?)?;
cfg_if::cfg_if! {
if #[cfg(feature = "trace")] {
let line_str = *line.fragment();
} else {
let line_str = line;
}
}
let length = line_str.len();
let bound_type = BoundType::try_from(line_str.get(L1..R1).ok_or_eyre("")?)?;
Ok(match bound_type {
BoundType::Fr | BoundType::Pl => BoundsLine::<T> {
bound_type,
bound_name: line.get(L2..R2).ok_or_eyre("")?.trim(),
column_name: line.get(L3..cmp::min(length, R3)).ok_or_eyre("")?.trim(),
bound_name: line_str.get(L2..R2).ok_or_eyre("")?.trim(),
column_name: line_str
.get(L3..cmp::min(length, R3))
.ok_or_eyre("")?
.trim(),
value: None,
},
_ => BoundsLine::<T> {
bound_type,
bound_name: line.get(L2..R2).ok_or_eyre("")?.trim(),
column_name: line.get(L3..R3).ok_or_eyre("")?.trim(),
value: Some(fast_float2::parse(
line.get(L4..cmp::min(length, R4)).ok_or_eyre("")?.trim(),
)?),
},
_ => {
// Check for sign character just before the value field
if L4 > 0 && line_str.len() > L4 {
if let Some(prev_char) = line_str.chars().nth(L4 - 1) {
if prev_char == '-' || prev_char == '+' {
return Err(eyre!(
"potential sign character excluded from value field"
));
}
}
}
BoundsLine::<T> {
bound_type,
bound_name: line_str.get(L2..R2).ok_or_eyre("")?.trim(),
column_name: line_str.get(L3..R3).ok_or_eyre("")?.trim(),
value: Some(fast_float2::parse(
line_str
.get(L4..cmp::min(length, R4))
.ok_or_eyre("")?
.trim(),
)?),
}
}
})
}

Expand Down Expand Up @@ -1211,16 +1257,29 @@ impl<'a, T: FastFloat> Parser<'a, T> {
}
}

let parts: Vec<&str> = line_str.split_whitespace().collect();
if parts.len() < 3 {
return Err(eyre!("insufficient fields in quadobj line"));
let len = line_str.len();
let var1 = line_str
.get(L2..R2.min(len))
.ok_or_eyre("missing var1 field in quadobj line")?
.trim();
let var2 = line_str
.get(L3..R3.min(len))
.ok_or_eyre("missing var2 field in quadobj line")?
.trim();
// Extend coefficient field to end-of-line to capture unpadded values
let val_str = line_str
.get(L4..len)
.ok_or_eyre("missing coefficient field in quadobj line")?
.trim();

if var1.is_empty() || var2.is_empty() || val_str.is_empty() {
return Err(eyre!("empty field in quadobj line"));
}

// Format: var1 var2 coefficient
Ok(QuadraticObjectiveTerm {
var1: parts[0],
var2: parts[1],
coefficient: fast_float2::parse(parts[2])?,
var1,
var2,
coefficient: fast_float2::parse(val_str)?,
})
},
);
Expand Down Expand Up @@ -1486,16 +1545,29 @@ impl<'a, T: FastFloat> Parser<'a, T> {
}
}

let parts: Vec<&str> = line_str.split_whitespace().collect();
if parts.len() < 3 {
return Err(eyre!("insufficient fields in QMATRIX line"));
let len = line_str.len();
let var1 = line_str
.get(L2..R2.min(len))
.ok_or_eyre("missing var1 field in QMATRIX line")?
.trim();
let var2 = line_str
.get(L3..R3.min(len))
.ok_or_eyre("missing var2 field in QMATRIX line")?
.trim();
// Extend coefficient field to end-of-line to capture unpadded values
let val_str = line_str
.get(L4..len)
.ok_or_eyre("missing coefficient field in QMATRIX line")?
.trim();

if var1.is_empty() || var2.is_empty() || val_str.is_empty() {
return Err(eyre!("empty field in QMATRIX line"));
}

// Format: var1 var2 coefficient
Ok(QuadraticTerm {
var1: parts[0],
var2: parts[1],
coefficient: fast_float2::parse(parts[2])?,
var1,
var2,
coefficient: fast_float2::parse(val_str)?,
})
},
);
Expand Down
Loading
Loading