Add namespaces

CHANGELOG.md

@@ -3,6 +3,10 @@
 
 ## New features
 
+- Namespaces can be used to structure source code and require the same file
+  more than one (in different contexts)
+  ([PR #734](https://github.com/jasmin-lang/jasmin/pull/734)).
+
 - The type systems for constant time and speculative constant time now ensure
   that division and modulo operators may only be used with public arguments.
   This ensures that problems like KyberSlash (https://kyberslash.cr.yp.to/) do

compiler/src/latex_printer.ml

@@ -380,7 +380,7 @@ let pp_global fmt { pgd_type ; pgd_name ; pgd_val } =
 let pp_path fmt s =
   F.fprintf fmt "%S " (L.unloc s)
 
-let pp_pitem fmt pi =
+let rec pp_pitem fmt pi =
   match L.unloc pi with
   | PFundef f -> pp_fundef fmt f
   | PParam p  -> pp_param fmt p
@@ -393,6 +393,15 @@ let pp_pitem fmt pi =
       F.fprintf fmt "%a%a " pp_from from kw "require";
       List.iter (pp_path fmt) s;
       F.fprintf fmt eol
+  | PNamespace (ns, pis) ->
+     (* TODO: ident within namespaces? *)
+     F.fprintf fmt "%a %s " kw "namespace" (L.unloc ns);
+     openbrace fmt ();
+     F.fprintf fmt eol;
+     List.iter (pp_pitem fmt) pis;
+     F.fprintf fmt eol;
+     closebrace fmt ();
+     F.fprintf fmt eol
 
 let pp_prog fmt =
   List.iter (F.fprintf fmt "%a" pp_pitem)

compiler/src/lexer.mll

@@ -40,6 +40,7 @@
     "if"    , IF     ;
     "inline", INLINE ;
     "mut"   , MUTABLE;
+    "namespace", NAMESPACE;
     "param" , PARAM  ;
     "ptr"   , POINTER;
     "reg"   , REG    ;
@@ -156,6 +157,7 @@ rule main = parse
   | ";"     { SEMICOLON  }
   | "?"     { QUESTIONMARK  }
   | ":"     { COLON  }
+  | "::"    { COLONCOLON  }
 
   | ">>r"                   { ROR              }
   | "<<r"                   { ROL              }

compiler/src/parser.mly

@@ -28,6 +28,7 @@
 %token BANG
 %token BANGEQ
 %token COLON
+%token COLONCOLON
 %token COMMA
 %token CONSTANT
 %token DOT
@@ -52,6 +53,7 @@
 %token               LTLT
 %token MINUS
 %token MUTABLE
+%token NAMESPACE
 %token PARAM
 %token PERCENT
 %token PIPE
@@ -99,8 +101,11 @@
 
 %%
 
+%inline qident:
+| x = separated_nonempty_list(COLONCOLON, NID) { String.concat "::" x }
+
 %inline ident:
-| x=loc(NID) { x }
+| x=loc(qident) { x }
 
 var:
 | x=ident { x }
@@ -486,6 +491,8 @@ top:
 | x=pglobal  { Syntax.PGlobal x }
 | x=pexec    { Syntax.Pexec   x }
 | x=prequire { Syntax.Prequire x}
+| NAMESPACE name = ident LBRACE pfs = loc(top)* RBRACE
+    { Syntax.PNamespace (name, pfs) }
 (* -------------------------------------------------------------------- *)
 module_:
 | pfs=loc(top)* EOF

compiler/src/pp_arm_m4.ml

@@ -6,6 +6,7 @@ Immediate values (denoted <imm>) are always nonnegative integers.
 
 open Arch_decl
 open Utils
+open PrintCommon
 open Prog
 open Var0
 open Arm_decl
@@ -67,7 +68,8 @@ let print_asm_lines fmt lns =
 (* -------------------------------------------------------------------- *)
 (* TODO_ARM: This is architecture-independent. *)
 
-let string_of_label name p = Printf.sprintf "L%s$%d" name (Conv.int_of_pos p)
+let string_of_label name p =
+  Format.asprintf "L%s$%d" (escape name) (Conv.int_of_pos p)
 
 let pp_label n lbl = string_of_label n lbl
 

compiler/src/ppasm.ml

@@ -1,5 +1,6 @@
 (* -------------------------------------------------------------------- *)
 open Utils
+open PrintCommon
 open Prog
 open Arch_decl
 open Label
@@ -33,7 +34,7 @@ let pp_gens (fmt : Format.formatter) xs =
 
 (* -------------------------------------------------------------------- *)
 let string_of_label name (p : label) =
-  Format.sprintf "L%s$%d" name (Conv.int_of_pos p)
+  Format.asprintf "L%s$%d" (escape name) (Conv.int_of_pos p)
 
 (* -------------------------------------------------------------------- *)
 type lreg =