Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-23 13:24:03 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[flightplan] fix gen_fp when 'path' is used in a loops

Browse Source
This commit is contained in:
Gautier Hattenberger
2016-11-08 22:26:52 +01:00
parent c4dc3c6fee
commit 5ae3ffe48e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/fp_proc.ml
+5 -2
View File
@@ -365,12 +365,12 @@ let process_relative_waypoints = fun xml ->
let regexp_path = Str.regexp "[ \t,]+"
let stage_process_path = fun stage rest ->
let rec stage_process_path = fun stage rest ->
if Xml.tag stage = "path" then
let waypoints = Str.split regexp_path (ExtXml.attrib stage "wpts") in
let attribs = Xml.attribs stage in
let rec loop = function
[] -> failwith "Waypoint expected in path stage"
| [] -> failwith "Waypoint expected in path stage"
| [wp] -> (* Just go to this single point *)
Xml.Element("go", ("wp", wp)::attribs, [])::rest
| wp1::wp2::ps ->
@@ -379,6 +379,9 @@ let stage_process_path = fun stage rest ->
"wp", wp2]@attribs, [])::
if ps = [] then rest else loop (wp2::ps) in
loop waypoints
else if Xml.tag stage = "for" || Xml.tag stage = "while" then
let attribs = Xml.attribs stage in
Xml.Element(Xml.tag stage, attribs, List.fold_right stage_process_path (Xml.children stage) [])::rest
else
stage::rest