← Back to branch summary

~ubuntu-branches/debian/sid/ocaml/sid

« back to all changes in this revision

Viewing changes to camlp4/Camlp4/Struct/Grammar/Search.ml

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Glondu
  • Date: 2011-04-21 21:35:08 UTC
  • mfrom: (1.1.11 upstream) (12.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110421213508-kg34453aqmb0moha
* Fixes related to -output-obj with g++ (in debian/patches):
  - add Declare-primitive-name-table-as-const-char
  - add Avoid-multiple-declarations-in-generated-.c-files-in
  - fix Embed-bytecode-in-C-object-when-using-custom: the closing
    brace for extern "C" { ... } was missing in some cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
camlp4/Camlp4/Struct/Grammar/Search.ml
49
49
      and search_symbol symb =
50
50
        match symb with
51
51
        [ Snterm _ | Snterml _ _ | Slist0 _ | Slist0sep _ _ | Slist1 _ |
52
 
          Slist1sep _ _ | Sopt _ | Stoken _ | Stree _ | Skeyword _
 
52
          Slist1sep _ _ | Sopt _ | Stry _ | Stoken _ | Stree _ | Skeyword _
53
53
          when symb == prev_symb ->
54
54
            Some symb
55
55
        | Slist0 symb ->
78
78
            match search_symbol symb with
79
79
            [ Some symb -> Some (Sopt symb)
80
80
            | None -> None ]
 
81
        | Stry symb ->
 
82
            match search_symbol symb with
 
83
            [ Some symb -> Some (Stry symb)
 
84
            | None -> None ]
81
85
        | Stree t ->
82
86
            match search_tree t with
83
87
            [ Some t -> Some (Stree t)