Luigi Rizzo
9eaa57bebc
simplify handling of 'include' lists
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
827abbf46e
... and use a single rule for timespec
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
7b10b81a58
use a single rule to parse timeranges hh:mm-hh:mm
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24252 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
5c940c74a6
if/ifTime/random statements are all the same thing
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
16f94523ad
includedname is just a regular word_or_default name,
...
no need for a separate nonterminal
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
df3f8aa2b9
remove useless 'extern' declaration
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
5cbf333fee
remove some unneeded local variables.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
f262d06975
more usage of nword(). I think the references to source
...
line/columns are also correct now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
d8e1ad052a
more simplifications involving linku1
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
182a536722
correct linku1() to handle the case tail = NULL correctly.
...
Now the function can be used to simplify other conditional blocks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
34e0ae0e6a
The build of aelparse was still broken in some cases, so instead of having to
...
keep figuring out workarounds for build issues on various platforms, just go
ahead and remove what started all of this. Two instances of ast_calloc have
been changed to calloc in pbx/ael/ael.y.
ast_copy_string isn't actually needed here because the only place it is used is
in ast_expr2f.c. However, the utils Makefile already builds its own
ast_expr2f.o with -DSTANDALONE, which makes it use strncpy instead of
ast_copy_string.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c305fb082d
more simplifications
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
01360f6440
always trim the trailing ';'
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
33167fc41c
comment usage of contexts
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
2c2f7e817b
fix dereferencing freed memory
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
595955ea98
switch a couple of operands.
...
This gives slightly different results from the previous code
on syntax errors, but it actually makes fewer mistakes so
i think it is an improvement. Additionally, it makes the
code more uniform (the other call of reset_argcount
occurs after LP and not before).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
8faa2e7d44
put back some simplifications, this time really tested
...
(ael_lex.c manually deleted, runtest passed)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
db14f6b107
revert ael.flex to the last correct version.
...
For some reason the makefile did not regenerate the
ael_lex.c file correctly so i was not testing the changes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
44f43f9eb1
another small set of simplifications
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c22ef69d1f
simplify logic (runtest passed).
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
85480376f7
more nword() usages, and mark some dubious places.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
f239ec2080
introduce a new frontend to npval for the very common case
...
of creating an object for a tring value PV_WORD.
Start using it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
5e746bf38f
another client for switchlist_block
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
813f565de7
more merge of common blocks through intermediate rules.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23614 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
f4b05f86cc
make destroy_pval able to handle a NULL value
...
(the warning should be removed);
define a 'elements_block' rule to simplify some other rules
removing duplicated code - runtests seems happy with this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
ce05a548c3
remove some commented-out code
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
36a26a9197
simplify updating the token position markers
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c5f779d0a0
more comments
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
9a8a037250
comment some code
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
6eb6343d9a
more simplifications in the bison sources,
...
more annotation with XXX of dubious code.
(The code still passes tests)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c7a892d5f9
make the 'runtest' filter less strict on line numbers.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
d30ead1474
simplify handling of line numbers
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
dad2812867
fix last known bug in computing columb numbers in error messages
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c1366df3d5
fix a bug in computing line numbers
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
799126216e
- fix miscalculation in column numbers when multiple tabs
...
or empty lines are involved;
- change linku1() to return the head of the list (unused at the moment);
- ignore the source line number in runtests as they change with the
source and cause mismatches in the comparison with the reference output.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
43bfe82828
last batch of npval -> npval2 changes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
5291b89f30
more npval -> npval2 changes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c9816d135d
more npval -> npval2 conversions
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
304fbbd1b6
fix destructor for pval objects (thanks to Steve Murphy);
...
rearrange initial part of ael.flex for flexibility.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
85ea0974f8
always call the destructor
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
456e27b453
document variable and options used.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
810e701b1e
document options, move objects of the same type close to
...
each other so it is evident what they are.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
9033ecfaa2
slightly restructure a block to reduce nesting,
...
mark some missing error checks
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
f0d3175793
imore npval -> npval2 conversions
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
cbbcc2047c
more npval2 replacement, mark XXX dubious arguments
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
5c34366afc
more npval -> npval2 replacement, and a fix for a likely
...
bug (marked XXX)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
dadafb65cf
introduce a simplified interface for npval and start using it
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22928 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
54616839d7
formatting fixes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
776a3da1a7
use ast_calloc for memory allocations
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
73ea5316b5
fix a couple of bugs in arguments to npval
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22902 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
b37af2f16c
remove some commented-out code
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
a5fdd0d6b0
finish packing yylloc into macros
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
e51725d6d4
add some comments to the code
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
7422c5495b
more formatting cleanup
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
5591294c5e
more dup removal
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
98d769c7c0
more duplicate removal
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
ef8f9a28a3
remove duplicated code
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
53715e59cf
staticize c_prevword()
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
073391cc63
more indentation fixes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
20314914e8
use asprintf instead of malloc
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
f7e55f9a47
more formatting cleanup
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c740982bef
more indentation fixes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
6c8c83c106
more formatting cleanup
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
c081c8bdf7
cleanup formatting to emphsize common code blocks
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
a8995c0bfd
move similar blocks close to each other to make similarities
...
more evident
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
e7d6df39d0
normalize and simplify the code for keeping track of line and column number.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
2d33128385
define some flex constants for character sets.
...
partly fix indentation and normalize code layout.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
d19f767c3c
uncomment some functions in the flex code that were actually
...
used in the bison code - detected by making aelparse compile
again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
a857016551
use \t to indicate a tab, and fix indentation for
...
the whitespace-handling rules
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
f52022fc6f
remove common blocks of code with a macro (waiting for a better
...
solution).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
df5635d844
staticize some variables
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
e141352fd9
comment behaviour of pbcwhere in preparation for its use
...
in more places.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22656 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
aaf99191c8
include/asterisk/ael_structs.h:
...
- protect against multiple includes of ael_structs.h
- remove prototypes for unused or undeclared functions
pbx/ael/ael.y
- staticize functions as appropriate
- constify arguments
- remove useless extern
pbx/ael/ael.flex
- ifdef out unused functions
pbx/pbx_ael.c
- constify some variables and arguments
- ifdef out unused functions
- staticize functions as appropriate
update generated files accordingly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
55a24ef8cc
whitespace-only change:
...
partly fix indentation/formatting of the bison source,
and of the generated file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
2de9dcb345
whitespace-only change:
...
fix formatting and indentation of the flex file,
and regenerate the ael_lex.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Luigi Rizzo
36807ad092
wrong path in include file.
...
Maybe it compiled on some platform because of extra -I
statements in the Makefiles.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Kevin P. Fleming
5f58cc8770
Merge Steve Murphy's (murf) complete re-implementation of AEL, which is now no longer considered experimental :-)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago