Parse defines as lists

hyper-tuner · Dec 29, 2023 · 0197ab6 · 0197ab6
1 parent cc51114
commit 0197ab6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 79 deletions.
diff --git a/lib/ini_parser.dart b/lib/ini_parser.dart
@@ -22,7 +22,7 @@ class INIParser {
   final String raw;
   final List<String> lines = [];
   final List<String> settings = [];
-  final Map<String, String> defines = {};
+  final Map<String, List<String>> defines = {};
 
   // assume that top level definitions are in the TunerStudio section (see FOME)
   String _currentSection = 'TunerStudio';
@@ -40,7 +40,6 @@ class INIParser {
     lines.addAll(preProcessor.lines);
     settings.addAll(preProcessor.settings);
     defines.addAll(preProcessor.defines);
-    _config.defines = defines;
 
     for (final line in lines) {
       _parseSections(line);

diff --git a/lib/models/ini_config.dart b/lib/models/ini_config.dart
@@ -1198,7 +1198,6 @@ class FrontPage {
 
 class INIConfig {
   Header header = Header();
-  Map<String, String> defines = {};
   List<SettingGroup> settingGroups = [];
   List<PcVariable> pcVariables = [];
   Constants constants = Constants();
@@ -1217,7 +1216,6 @@ class INIConfig {
   Map<String, dynamic> toJson() {
     return {
       'header': header.toJson(),
-      'defines': defines,
       'settingGroups': settingGroups.map((c) => c.toJson()).toList(),
       'pcVariables': pcVariables.map((c) => c.toJson()).toList(),
       'constants': constants.toJson(),

diff --git a/lib/pre_processor.dart b/lib/pre_processor.dart
@@ -8,7 +8,7 @@ class PreProcessor {
   late final String raw;
   late final List<String> settings;
   final List<String> lines = [];
-  final Map<String, String> defines = {};
+  final Map<String, List<String>> defines = {};
 
   /// Pre-process INI:
   /// - remove comments
@@ -88,9 +88,11 @@ class PreProcessor {
       if (line.startsWith('#define')) {
         final parts = line.substring(7).trim().split('=');
         final key = parts[0].sanitize();
-        final value = parts[1].sanitize();
+        final values = parts[1].sanitize().split(',').map((e) => e.sanitize());
 
-        defines.addAll({key: value});
+        defines.addAll({
+          key: values.toList(),
+        });
 
         continue;
       }

diff --git a/test/data/fome/json/fome_proteus_f4.json b/test/data/fome/json/fome_proteus_f4.json
@@ -14,7 +14,6 @@
     "iniSpecVersion": null,
     "hyperTunerCloudUrl": "tunes.fome.tech"
   },
-  "defines": {},
   "settingGroups": [],
   "pcVariables": [
     {