From caa19db7c11ee3c53833614e66a2b8d1a0d31668 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 27 Feb 2016 20:00:25 -0500 Subject: Revert "eshtrans/frontend: Comment out dbg() and its calls" This reverts commit c9b9e578ed90b5421ae77f7e55941be09f17bdab. Conflicts: eshtrans/frontend/lexer.esh --- (limited to 'eshtrans') diff --git a/eshtrans/frontend/lexer.esh b/eshtrans/frontend/lexer.esh index e0f703c..f43b47d 100644 --- a/eshtrans/frontend/lexer.esh +++ b/eshtrans/frontend/lexer.esh @@ -18,7 +18,7 @@ # along with the Eggshell Compiler. If not, see # . -#dbg=false +dbg=false fname= lineno= @@ -31,12 +31,12 @@ here_awaiting_end= here_awaiting_word= tok= -#dbg() -#{ -# if ${dbg}; then -# printf 'DEBUG: %s\n' "${@}" >&2 -# fi -#} +dbg() +{ + if ${dbg}; then + printf 'DEBUG: %s\n' "${@}" >&2 + fi +} # # Error handling (used by scanning and interface functions) @@ -125,7 +125,7 @@ next() return fi while :; do - #dbg "parsing char '$c' at lineno $lineno" + dbg "parsing char '$c' at lineno $lineno" case "${c}" in '') lgetc @@ -204,7 +204,7 @@ next() return ;; esac - #dbg T_SEMI + dbg T_SEMI tok=T_SEMI return ;; @@ -427,7 +427,7 @@ scan_word() quoted=false while :; do - #dbg "parsing word char '$c' at lineno $lineno" + dbg "parsing word char '$c' at lineno $lineno" case "${c}" in '') break @@ -482,10 +482,10 @@ scan_word() break ;; \\) - #dbg 'first backslash in word' + dbg 'first backslash in word' word="${word}${c}" lgetc - #dbg "next char: '$c'" + dbg "next char: '$c'" case "${c}" in '') # Bash, ksh93, mksh, and zsh ignore a # backslash at the end of a file, but @@ -717,7 +717,7 @@ scan_wordexp_param_brace() # subshell. lineno=$((${lineno} + ${ln_off})) wordexp="${wordexp}${res}" - #dbg "param mod word: '$res'" + dbg "param mod word: '$res'" fi # Check for right brace. @@ -927,13 +927,13 @@ accept() shift 1 local rw= - #dbg "looking for $t, current tok ${tok%%${US}*}" + dbg "looking for $t, current tok ${tok%%${US}*}" case "${t}" in T_IF|T_THEN|T_ELSE|T_ELIF|T_FI|T_DO|T_DONE|\ T_CASE|T_ESAC|T_WHILE|T_UNTIL|T_FOR|\ T_LBRACE|T_RBRACE|T_BANG|T_IN|\ T_STATIC|T_LOCAL|T_RETURN) - #dbg "looking for reserved word $t, have '$tok'" + dbg "looking for reserved word $t, have '$tok'" if ! [ "x${tok%%${US}*}" = "x${t}" ]; then # Reserved words are recognized as literal # T_WORDs. @@ -1034,7 +1034,7 @@ accept() ;; esac - #dbg "accept $t" + dbg "accept $t" printf '%s' "${tok}${RS}" next return 0 -- cgit v0.9.1