Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1657)

Side by Side Diff: lily/parser.yy

Issue 363720043: Syntax: fold a few scheme and music functions (Closed)
Patch Set: Created 5 years, 9 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lily/lily-imports.cc ('k') | scm/ly-syntax-constructors.scm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* -*- mode: c++; c-file-style: "linux"; indent-tabs-mode: t -*- */ 1 /* -*- mode: c++; c-file-style: "linux"; indent-tabs-mode: t -*- */
2 /* 2 /*
3 This file is part of LilyPond, the GNU music typesetter. 3 This file is part of LilyPond, the GNU music typesetter.
4 4
5 Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl> 5 Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
6 Jan Nieuwenhuizen <janneke@gnu.org> 6 Jan Nieuwenhuizen <janneke@gnu.org>
7 7
8 LilyPond is free software: you can redistribute it and/or modify 8 LilyPond is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation, either version 3 of the License, or 10 the Free Software Foundation, either version 3 of the License, or
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 ; 815 ;
816 816
817 partial_function: 817 partial_function:
818 partial_function_scriptable 818 partial_function_scriptable
819 | OVERRIDE grob_prop_path '=' 819 | OVERRIDE grob_prop_path '='
820 { 820 {
821 if (SCM_UNBNDP ($2)) 821 if (SCM_UNBNDP ($2))
822 $$ = scm_list_1 (SCM_BOOL_F); 822 $$ = scm_list_1 (SCM_BOOL_F);
823 else 823 else
824 $$ = scm_cons 824 $$ = scm_cons
825 » » » » (scm_list_3 (Syntax::property_override_function, 825 » » » » (scm_list_3 (Syntax::property_override,
826 scm_cdr ($2), scm_car ($2)), 826 scm_cdr ($2), scm_car ($2)),
827 SCM_EOL); 827 SCM_EOL);
828 } 828 }
829 | SET context_prop_spec '=' 829 | SET context_prop_spec '='
830 { 830 {
831 if (SCM_UNBNDP ($2)) 831 if (SCM_UNBNDP ($2))
832 $$ = scm_list_1 (SCM_BOOL_F); 832 $$ = scm_list_1 (SCM_BOOL_F);
833 else 833 else
834 $$ = scm_cons 834 $$ = scm_cons
835 » » » » (scm_list_3 (Syntax::property_set_function, 835 » » » » (scm_list_3 (Syntax::property_set,
836 scm_cadr ($2), scm_car ($2)), 836 scm_cadr ($2), scm_car ($2)),
837 SCM_EOL); 837 SCM_EOL);
838 } 838 }
839 | OVERRIDE grob_prop_path '=' partial_function 839 | OVERRIDE grob_prop_path '=' partial_function
840 { 840 {
841 if (SCM_UNBNDP ($2)) 841 if (SCM_UNBNDP ($2))
842 $$ = scm_list_1 (SCM_BOOL_F); 842 $$ = scm_list_1 (SCM_BOOL_F);
843 else 843 else
844 $$ = scm_cons 844 $$ = scm_cons
845 » » » » (scm_list_3 (Syntax::property_override_function, 845 » » » » (scm_list_3 (Syntax::property_override,
846 scm_cdr ($2), scm_car ($2)), 846 scm_cdr ($2), scm_car ($2)),
847 $4); 847 $4);
848 } 848 }
849 | SET context_prop_spec '=' partial_function 849 | SET context_prop_spec '=' partial_function
850 { 850 {
851 if (SCM_UNBNDP ($2)) 851 if (SCM_UNBNDP ($2))
852 $$ = scm_list_1 (SCM_BOOL_F); 852 $$ = scm_list_1 (SCM_BOOL_F);
853 else 853 else
854 $$ = scm_cons 854 $$ = scm_cons
855 » » » » (scm_list_3 (Syntax::property_set_function, 855 » » » » (scm_list_3 (Syntax::property_set,
856 scm_cadr ($2), scm_car ($2)), 856 scm_cadr ($2), scm_car ($2)),
857 $4); 857 $4);
858 } 858 }
859 // Stupid duplication because we already expect ETC here. It will follow anyway . 859 // Stupid duplication because we already expect ETC here. It will follow anyway .
860 | script_dir markup_mode markup_partial_function 860 | script_dir markup_mode markup_partial_function
861 { 861 {
862 if (SCM_UNBNDP ($1)) 862 if (SCM_UNBNDP ($1))
863 $1 = SCM_INUM0; 863 $1 = SCM_INUM0;
864 $3 = MAKE_SYNTAX (partial_markup, @3, $3); 864 $3 = MAKE_SYNTAX (partial_markup, @3, $3);
865 parser->lexer_->pop_state (); 865 parser->lexer_->pop_state ();
(...skipping 3878 matching lines...) Expand 10 before | Expand all | Expand 10 after
4744 Lily_lexer *lex = parser->lexer_; 4744 Lily_lexer *lex = parser->lexer_;
4745 4745
4746 lex->lexval_ = s; 4746 lex->lexval_ = s;
4747 lex->lexloc_ = loc; 4747 lex->lexloc_ = loc;
4748 int tok = lex->pop_extra_token (); 4748 int tok = lex->pop_extra_token ();
4749 if (tok >= 0) 4749 if (tok >= 0)
4750 return tok; 4750 return tok;
4751 lex->prepare_for_next_token (); 4751 lex->prepare_for_next_token ();
4752 return lex->yylex (); 4752 return lex->yylex ();
4753 } 4753 }
OLDNEW
« no previous file with comments | « lily/lily-imports.cc ('k') | scm/ly-syntax-constructors.scm » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b