Small clean-up of the sed scripts.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5606 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-11-08 11:24:45 +00:00
parent a6e25f8b77
commit be64829b36
3 changed files with 11 additions and 11 deletions

View File

@ -1,3 +1,9 @@
2002-11-07 Angus Leeming <leeming@lyx.org>
* forms/fdfixh.sed: generate the d-tors in a clean way.
* forms/fdfixc.sed: Go from "fdui->form_xxx" to "fdui->form" in
a clean way.
2002-10-31 Herbert Voss <voss@perce.de> 2002-10-31 Herbert Voss <voss@perce.de>
* FormGraphics.C (build, apply): get the rotate-list from the * FormGraphics.C (build, apply): get the rotate-list from the

View File

@ -24,14 +24,9 @@ s/FD_form_\(.*\)/FD_\1/
# FL_FORM * form; # FL_FORM * form;
# so we must do so here too. # so we must do so here too.
# #
# 1. Rewrite "fdui->form_xxx->fdui = ..." as "fdui->form->fdui = ..." # Rewrite "fdui->form_xxx" as "fdui->form"
s/fdui->form_\([^ ]*\)->fdui =/fdui->form->fdui =/ # xxx is followed by ' ', '->' or ')', so use these to flag when xxx ends.
/fdui->form/s/\(fdui->form\)_[^ )-]*/\1/
# 2. Rewrite "fdui->form_xxx = ..." as "fdui->form = ..."
s/fdui->form_\([^ ]*\) =/fdui->form =/
# 3. Rewrite "fdui->form_xxx->..." as "fdui->form->..."
s/fdui->form_\([^ ]*\)->/fdui->form->/
# Replace "forms.h" by FORMS_H_LOCATION in the #include directives # Replace "forms.h" by FORMS_H_LOCATION in the #include directives
s/#include \"forms\.h\"/#include FORMS_H_LOCATION/ s/#include \"forms\.h\"/#include FORMS_H_LOCATION/

View File

@ -99,9 +99,8 @@ d
i\ i\
# 2. Rewrite "} FD_xxx;" as "struct FD_xxx {" and append a d-tor. # 2. Rewrite "} FD_xxx;" as "struct FD_xxx {" and append a d-tor.
s/} \(.*\);/struct \1 {/p s/} \(.*\);/struct \1 {\
# When the wrappers are here, delete this line and the p-print command above ~\1();/
/struct/s/struct \(.*\) {/ ~\1();/
# 3. Paste the contents of the hold space beneath it # 3. Paste the contents of the hold space beneath it
G G