Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added line-break constraint

Browse Source
This commit is contained in:
waldemar%netscape.com 2000-08-22 04:29:01 +00:00
parent b9ffa39439
commit 89765d999d
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/semantics/Calculus.lisp
View File

@ -3072,9 +3072,11 @@
(preprocess-grammar-or-lexer preprocessor-state :grammar kind2 name start-symbol))
(defun generate-no-line-break-constraint (terminal)
(defun generate-line-break-constraints (terminal)
(assert-type terminal user-terminal)
(list (list (make-lf-terminal terminal) :no-line-break)))
(list
(list terminal :line-break)
(list (make-lf-terminal terminal) :no-line-break)))
; (line-grammar <name> <kind> <start-symbol>)
@ -3087,8 +3089,8 @@
(defun preprocess-line-grammar (preprocessor-state command name kind2 start-symbol)
(declare (ignore command))
(preprocess-grammar-or-lexer preprocessor-state :grammar kind2 name start-symbol
:variant-constraint-names '(:no-line-break)
:variant-generator #'generate-no-line-break-constraint))
:variant-constraint-names '(:line-break :no-line-break)
:variant-generator #'generate-line-break-constraints))
; (lexer <name> <kind> <start-symbol> <charclasses-source> <lexer-actions-source>)

7
js/semantics/Grammar.lisp
View File

@ -1225,7 +1225,7 @@
;
; A variant-generator is either nil or a function that takes a terminal and outputs a list of its variants.
; Each variant is specified as a cons of:
; A variant terminal
; A variant terminal (may be eql to the original terminal; this lets one add constraints that exclude the original terminal)
; A list of names of variant constraints which exclude this variant terminal
;
; The rhs can also contain lookahead constraints of the form
@ -1317,8 +1317,9 @@
(dolist (terminal (hash-table-keys terminals-hash))
(dolist (variant-and-constraints (funcall variant-generator terminal))
(let ((variant (first variant-and-constraints)))
(push variant (gethash terminal terminal-variants))
(setf (gethash variant terminals-hash) t)
(unless (grammar-symbol-= terminal variant)
(push variant (gethash terminal terminal-variants))
(setf (gethash variant terminals-hash) t))
(dolist (constraint (rest variant-and-constraints))
(push variant (cdr (assoc constraint variant-constraint-forbid-lists))))))))

1
js/semantics/HTML.lisp
View File

@ -487,6 +487,7 @@
((:but-not 6) (b "except"))
((:begin-negative-lookahead 13) "[lookahead" :not-member-10 "{")
((:end-negative-lookahead 2) "}]")
((:line-break 12) "[line" nbsp "break]")
((:no-line-break 15) "[no" nbsp "line" nbsp "break]")
(:subscript sub)
(:superscript sup)

1
js/semantics/RTF.lisp
View File

@ -323,6 +323,7 @@
((:but-not 6) (b "except"))
((:begin-negative-lookahead 13) "[lookahead" :not-member-10 "{")
((:end-negative-lookahead 2) "}]")
((:line-break 12) "[line" ~ "break]")
((:no-line-break 15) "[no" ~ "line" ~ "break]")
(:subscript sub)
(:superscript super)

10
js2/semantics/Calculus.lisp
View File

@ -3072,9 +3072,11 @@
(preprocess-grammar-or-lexer preprocessor-state :grammar kind2 name start-symbol))
(defun generate-no-line-break-constraint (terminal)
(defun generate-line-break-constraints (terminal)
(assert-type terminal user-terminal)
(list (list (make-lf-terminal terminal) :no-line-break)))
(list
(list terminal :line-break)
(list (make-lf-terminal terminal) :no-line-break)))
; (line-grammar <name> <kind> <start-symbol>)
@ -3087,8 +3089,8 @@
(defun preprocess-line-grammar (preprocessor-state command name kind2 start-symbol)
(declare (ignore command))
(preprocess-grammar-or-lexer preprocessor-state :grammar kind2 name start-symbol
:variant-constraint-names '(:no-line-break)
:variant-generator #'generate-no-line-break-constraint))
:variant-constraint-names '(:line-break :no-line-break)
:variant-generator #'generate-line-break-constraints))
; (lexer <name> <kind> <start-symbol> <charclasses-source> <lexer-actions-source>)

7
js2/semantics/Grammar.lisp
View File

@ -1225,7 +1225,7 @@
;
; A variant-generator is either nil or a function that takes a terminal and outputs a list of its variants.
; Each variant is specified as a cons of:
; A variant terminal
; A variant terminal (may be eql to the original terminal; this lets one add constraints that exclude the original terminal)
; A list of names of variant constraints which exclude this variant terminal
;
; The rhs can also contain lookahead constraints of the form
@ -1317,8 +1317,9 @@
(dolist (terminal (hash-table-keys terminals-hash))
(dolist (variant-and-constraints (funcall variant-generator terminal))
(let ((variant (first variant-and-constraints)))
(push variant (gethash terminal terminal-variants))
(setf (gethash variant terminals-hash) t)
(unless (grammar-symbol-= terminal variant)
(push variant (gethash terminal terminal-variants))
(setf (gethash variant terminals-hash) t))
(dolist (constraint (rest variant-and-constraints))
(push variant (cdr (assoc constraint variant-constraint-forbid-lists))))))))

1
js2/semantics/HTML.lisp
View File

@ -487,6 +487,7 @@
((:but-not 6) (b "except"))
((:begin-negative-lookahead 13) "[lookahead" :not-member-10 "{")
((:end-negative-lookahead 2) "}]")
((:line-break 12) "[line" nbsp "break]")
((:no-line-break 15) "[no" nbsp "line" nbsp "break]")
(:subscript sub)
(:superscript sup)

1
js2/semantics/RTF.lisp
View File

@ -323,6 +323,7 @@
((:but-not 6) (b "except"))
((:begin-negative-lookahead 13) "[lookahead" :not-member-10 "{")
((:end-negative-lookahead 2) "}]")
((:line-break 12) "[line" ~ "break]")
((:no-line-break 15) "[no" ~ "line" ~ "break]")
(:subscript sub)
(:superscript super)